Merge branch 'main' into fontlib

This commit is contained in:
georgemoralis 2025-05-17 18:51:37 +03:00 committed by GitHub
commit b36bf6153e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 120 additions and 118 deletions

View file

@ -155,7 +155,7 @@ SaveDialogState::SaveDialogState(const OrbisSaveDataDialogParam& param) {
if (item->focusPos != FocusPos::DIRNAME) {
this->focus_pos = item->focusPos;
} else {
} else if (item->focusPosDirName != nullptr) {
this->focus_pos = item->focusPosDirName->data.to_string();
}
this->style = item->itemStyle;

View file

@ -316,7 +316,9 @@ static std::array<std::optional<SaveInstance>, 16> g_mount_slots;
static void initialize() {
g_initialized = true;
g_game_serial = ElfInfo::Instance().GameSerial();
g_game_serial = Common::Singleton<PSF>::Instance()
->GetString("INSTALL_DIR_SAVEDATA")
.value_or(ElfInfo::Instance().GameSerial());
g_fw_ver = ElfInfo::Instance().FirmwareVer();
Backup::StartThread();
}