sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt: Simplify settings version check

Browse Source
This commit is contained in:
Connor McLaughlin
2020-10-09 18:26:21 +10:00
parent 74880ac047
commit cb6502afa3
7 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1989,19 +1989,19 @@ std::string CommonHostInterface::GetMostRecentResumeSaveStatePath() const
return std::move(most_recent->FileName);
}
void CommonHostInterface::CheckSettings(SettingsInterface& si)
bool CommonHostInterface::CheckSettings(SettingsInterface& si)
{
const int settings_version = si.GetIntValue("Main", "SettingsVersion", -1);
if (settings_version == SETTINGS_VERSION)
return;
return true;
m_settings_version_mismatch_str = StringUtil::StdStringFromFormat(
"Settings version %d does not match expected version %d, resetting", settings_version, SETTINGS_VERSION);
ReportError(m_settings_version_mismatch_str.c_str());
Log_ErrorPrintf("Settings version %d does not match expected version %d, resetting", settings_version,
SETTINGS_VERSION);
si.Clear();
si.SetIntValue("Main", "SettingsVersion", SETTINGS_VERSION);
SetDefaultSettings(si);
return false;
}
void CommonHostInterface::SetDefaultSettings(SettingsInterface& si)
@ -2103,11 +2103,6 @@ void CommonHostInterface::CheckForSettingsChanges(const Settings& old_settings)
UpdateInputMap();
}
const std::string& CommonHostInterface::GetSettingsVersionMismatchString() const
{
return m_settings_version_mismatch_str;
}
void CommonHostInterface::SetTimerResolutionIncreased(bool enabled)
{
if (m_timer_resolution_increased == enabled)