github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-07-23 10:30:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

System: Load state before calling OnSystemStarted()

Browse Source 
Needed for transitent state cleanup on Android.
This commit is contained in:
Stenzek 2024-12-11 17:55:53 +10:00
parent d8af8e4a60
commit e507fdcb1f
No known key found for this signature in database
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/system.cpp
View File

@ -1863,6 +1863,15 @@ bool System::BootSystem(SystemBootParameters parameters, Error* error)
s_state.state = State::Running; s_state.state = State::Running;
SPU::GetOutputStream()->SetPaused(false); SPU::GetOutputStream()->SetPaused(false);
// try to load the state, if it fails, bail out
if (!parameters.save_state.empty() && !LoadState(parameters.save_state.c_str(), error, false))
{
Error::AddPrefixFmt(error, "Failed to load save state file '{}' for booting:\n",
Path::GetFileName(parameters.save_state));
DestroySystem();
return false;
}
FullscreenUI::OnSystemStarted(); FullscreenUI::OnSystemStarted();
InputManager::UpdateHostMouseMode(); InputManager::UpdateHostMouseMode();
@ -1878,15 +1887,6 @@ bool System::BootSystem(SystemBootParameters parameters, Error* error)
Host::OnSystemStarted(); Host::OnSystemStarted();
Host::OnIdleStateChanged(); Host::OnIdleStateChanged();
// try to load the state, if it fails, bail out
if (!parameters.save_state.empty() && !LoadState(parameters.save_state.c_str(), error, false))
{
Error::AddPrefixFmt(error, "Failed to load save state file '{}' for booting:\n",
Path::GetFileName(parameters.save_state));
DestroySystem();
return false;
}
if (parameters.load_image_to_ram || g_settings.cdrom_load_image_to_ram) if (parameters.load_image_to_ram || g_settings.cdrom_load_image_to_ram)
CDROM::PrecacheMedia(); CDROM::PrecacheMedia();