history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-15 15:05:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

CommonHostInterface: Move save state on exit logic to base class

Browse Source
This commit is contained in:
Connor McLaughlin
2021-03-03 01:14:05 +10:00
parent 7645ca3836
commit c58227752d
9 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontend-common/common_host_interface.cpp
View File

@ -199,12 +199,15 @@ void CommonHostInterface::DestroySystem()
HostInterface::DestroySystem();
}
void CommonHostInterface::PowerOffSystem()
void CommonHostInterface::PowerOffSystem(bool save_resume_state)
{
if (System::IsShutdown())
return;
HostInterface::PowerOffSystem();
if (save_resume_state)
SaveResumeSaveState();
DestroySystem();
if (InBatchMode())
RequestExit();
@ -753,6 +756,11 @@ bool CommonHostInterface::ResumeSystemFromMostRecentState()
return LoadState(path.c_str());
}
bool CommonHostInterface::ShouldSaveResumeState() const
{
return g_settings.save_state_on_exit;
}
bool CommonHostInterface::IsRunningAtNonStandardSpeed() const
{
if (!System::IsValid())
@ -1810,7 +1818,7 @@ void CommonHostInterface::RegisterGeneralHotkeys()
{
SmallString confirmation_message(
TranslateString("CommonHostInterface", "Are you sure you want to stop emulation?"));
if (g_settings.save_state_on_exit)
if (ShouldSaveResumeState())
{
confirmation_message.AppendString("\n\n");
confirmation_message.AppendString(
@ -1824,10 +1832,7 @@ void CommonHostInterface::RegisterGeneralHotkeys()
}
}
if (g_settings.save_state_on_exit)
SaveResumeSaveState();
PowerOffSystem();
PowerOffSystem(ShouldSaveResumeState());
}
});
#else