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

Settings: Persist OSD options when resetting

Browse Source
This commit is contained in:
Connor McLaughlin 2022-10-08 23:36:39 +10:00
parent 1745d3e803
commit 3a3f571ecc
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/system.cpp
View File

@ -791,6 +791,15 @@ void System::LoadSettings(bool display_osd_messages)
void System::SetDefaultSettings(SettingsInterface& si) void System::SetDefaultSettings(SettingsInterface& si)
{ {
Settings temp; Settings temp;
// we don't want to reset some things (e.g. OSD)
temp.display_show_osd_messages = g_settings.display_show_osd_messages;
temp.display_show_fps = g_settings.display_show_fps;
temp.display_show_speed = g_settings.display_show_speed;
temp.display_show_resolution = g_settings.display_show_resolution;
temp.display_show_cpu = g_settings.display_show_cpu;
temp.display_show_gpu = g_settings.display_show_gpu;
temp.Save(si); temp.Save(si);
} }

11
src/frontend-common/common_host.cpp
View File

@ -287,18 +287,9 @@ void CommonHost::SetDefaultSettings(SettingsInterface& si)
si.SetBoolValue("Main", "EnableDiscordPresence", false); si.SetBoolValue("Main", "EnableDiscordPresence", false);
#endif #endif
#ifdef WITH_CHEEVOS #if defined(WITH_CHEEVOS) && defined(WITH_RAINTEGRATION)
si.SetBoolValue("Cheevos", "Enabled", false);
si.SetBoolValue("Cheevos", "TestMode", false);
si.SetBoolValue("Cheevos", "UnofficialTestMode", false);
si.SetBoolValue("Cheevos", "UseFirstDiscFromPlaylist", true);
si.DeleteValue("Cheevos", "Username");
si.DeleteValue("Cheevos", "Token");
#ifdef WITH_RAINTEGRATION
si.SetBoolValue("Cheevos", "UseRAIntegration", false); si.SetBoolValue("Cheevos", "UseRAIntegration", false);
#endif #endif
#endif
} }
void CommonHost::SetDefaultControllerSettings(SettingsInterface& si) void CommonHost::SetDefaultControllerSettings(SettingsInterface& si)