OmniNX/sphaira
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

in save menu close account service as soon as account data is loaded.

Browse Source
This commit is contained in:
ITotalJustice
2025-06-07 11:49:50 +01:00
parent 74c1cd3be0
commit 8d958a2d1d
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sphaira/include/ui/menus/save_menu.hpp
View File

@@ -39,12 +39,6 @@ struct Entry final : FsSaveDataInfo {
} }
}; };
struct AccountEntry {
AccountUid uid;
AccountProfile profile;
AccountProfileBase base;
};
struct ThreadResultData { struct ThreadResultData {
u64 id{}; u64 id{};
std::shared_ptr<NsApplicationControlData> control{}; std::shared_ptr<NsApplicationControlData> control{};
@@ -140,7 +134,7 @@ private:
bool m_is_reversed{}; bool m_is_reversed{};
bool m_dirty{}; bool m_dirty{};
std::vector<AccountEntry> m_accounts{}; std::vector<AccountProfileBase> m_accounts{};
s64 m_account_index{}; s64 m_account_index{};
ThreadData m_thread_data{}; ThreadData m_thread_data{};

22
sphaira/source/ui/menus/save_menu.cpp
View File

@@ -370,16 +370,16 @@ auto BuildSaveBasePath(const Entry& e) -> fs::FsPath {
return fs::AppendPath("/dumps/SAVE/", name); return fs::AppendPath("/dumps/SAVE/", name);
} }
auto BuildSavePath(const AccountEntry& acc, const Entry& e, bool is_auto) -> fs::FsPath { auto BuildSavePath(const AccountProfileBase& acc, const Entry& e, bool is_auto) -> fs::FsPath {
const auto t = std::time(NULL); const auto t = std::time(NULL);
const auto tm = std::localtime(&t); const auto tm = std::localtime(&t);
const auto base = BuildSaveBasePath(e); const auto base = BuildSaveBasePath(e);
fs::FsPath name_buf; fs::FsPath name_buf;
if (is_auto) { if (is_auto) {
std::snprintf(name_buf, sizeof(name_buf), "AUTO - %s", acc.base.nickname); std::snprintf(name_buf, sizeof(name_buf), "AUTO - %s", acc.nickname);
} else { } else {
std::snprintf(name_buf, sizeof(name_buf), "%s", acc.base.nickname); std::snprintf(name_buf, sizeof(name_buf), "%s", acc.nickname);
} }
utilsReplaceIllegalCharacters(name_buf, true); utilsReplaceIllegalCharacters(name_buf, true);
@@ -505,7 +505,7 @@ Result RestoreSaveInternal(ProgressBox* pbox, const Entry& e, const fs::FsPath&
R_SUCCEED(); R_SUCCEED();
} }
Result BackupSaveInternal(ProgressBox* pbox, const dump::DumpLocation& location, const AccountEntry& acc, const Entry& e, bool compressed, bool is_auto = false) { Result BackupSaveInternal(ProgressBox* pbox, const dump::DumpLocation& location, const AccountProfileBase& acc, const Entry& e, bool compressed, bool is_auto = false) {
std::unique_ptr<fs::Fs> fs; std::unique_ptr<fs::Fs> fs;
if (location.entry.type == dump::DumpLocationType_Stdio) { if (location.entry.type == dump::DumpLocationType_Stdio) {
fs = std::make_unique<fs::FsStdio>(true, location.stdio[location.entry.index].mount); fs = std::make_unique<fs::FsStdio>(true, location.stdio[location.entry.index].mount);
@@ -849,7 +849,7 @@ Menu::Menu(u32 flags) : grid::Menu{"Saves"_i18n, flags} {
SidebarEntryArray::Items account_items; SidebarEntryArray::Items account_items;
for (const auto& e : m_accounts) { for (const auto& e : m_accounts) {
account_items.emplace_back(e.base.nickname); account_items.emplace_back(e.nickname);
} }
if (m_entries.size()) { if (m_entries.size()) {
@@ -934,11 +934,11 @@ Menu::Menu(u32 flags) : grid::Menu{"Saves"_i18n, flags} {
for (s32 i = 0; i < account_count; i++) { for (s32 i = 0; i < account_count; i++) {
AccountProfile profile; AccountProfile profile;
if (R_SUCCEEDED(accountGetProfile(&profile, uids[i]))) { if (R_SUCCEEDED(accountGetProfile(&profile, uids[i]))) {
ON_SCOPE_EXIT(accountProfileClose(&profile));
AccountProfileBase base; AccountProfileBase base;
if (R_SUCCEEDED(accountProfileGet(&profile, nullptr, &base))) { if (R_SUCCEEDED(accountProfileGet(&profile, nullptr, &base))) {
m_accounts.emplace_back(uids[i], profile, base); m_accounts.emplace_back(base);
} else {
accountProfileClose(&profile);
} }
} }
} }
@@ -970,10 +970,6 @@ Menu::Menu(u32 flags) : grid::Menu{"Saves"_i18n, flags} {
Menu::~Menu() { Menu::~Menu() {
m_thread_data.Close(); m_thread_data.Close();
for (auto& e : m_accounts) {
accountProfileClose(&e.profile);
}
for (auto& e : ncm_entries) { for (auto& e : ncm_entries) {
e.Close(); e.Close();
} }
@@ -1067,7 +1063,7 @@ void Menu::SetIndex(s64 index) {
} }
char title[0x40]; char title[0x40];
std::snprintf(title, sizeof(title), "%s | %016lX", m_accounts[m_account_index].base.nickname, m_entries[m_index].application_id); std::snprintf(title, sizeof(title), "%s | %016lX", m_accounts[m_account_index].nickname, m_entries[m_index].application_id);
SetTitleSubHeading(title); SetTitleSubHeading(title);
this->SetSubHeading(std::to_string(m_index + 1) + " / " + std::to_string(m_entries.size())); this->SetSubHeading(std::to_string(m_index + 1) + " / " + std::to_string(m_entries.size()));
} }