mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-07 08:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Config: Move the 'Display' settings from ConfigManager to the layered config system

Browse source
This commit is contained in:
iwubcode 2019-03-02 22:41:50 -06:00
commit 840afc2ad4
15 changed files with 83 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/UICommon/UICommon.cpp
View file

@ -376,7 +376,7 @@ void EnableScreenSaver(bool enable)
// disable low-power states and/or screen dimming.
#if defined(HAVE_X11) && HAVE_X11
if (SConfig::GetInstance().bDisableScreenSaver)
if (Config::Get(Config::MAIN_DISABLE_SCREENSAVER))
{
X11Utils::InhibitScreensaver(win, !enable);
}
@ -391,7 +391,7 @@ void EnableScreenSaver(bool enable)
else
{
EXECUTION_STATE should_screen_save =
SConfig::GetInstance().bDisableScreenSaver ? ES_DISPLAY_REQUIRED : 0;
Config::Get(Config::MAIN_DISABLE_SCREENSAVER) ? ES_DISPLAY_REQUIRED : 0;
SetThreadExecutionState(ES_CONTINUOUS | should_screen_save | ES_SYSTEM_REQUIRED);
}
#endif
@ -399,7 +399,7 @@ void EnableScreenSaver(bool enable)
#ifdef __APPLE__
static IOPMAssertionID s_power_assertion = kIOPMNullAssertionID;
if (SConfig::GetInstance().bDisableScreenSaver)
if (Config::Get(Config::MAIN_DISABLE_SCREENSAVER))
{
if (enable)
{