From 960ffd2e8529aad11042d939e17c7b902cf4c5f6 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Apr 2017 16:34:25 -0700 Subject: [PATCH] Core: Remove bRestartRequired config hack. --- Core/Config.cpp | 3 --- Core/Config.h | 2 -- Windows/main.cpp | 4 ---- 3 files changed, 9 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 76bbd45f7a..c1d1ecb029 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -496,9 +496,6 @@ static ConfigSetting graphicsSettings[] = { ReportedConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, false, true, true), ConfigSetting("FrameRate", &g_Config.iFpsLimit, 0, true, true), ConfigSetting("FrameSkipUnthrottle", &g_Config.bFrameSkipUnthrottle, &DefaultFrameskipUnthrottle, true, false), -#if defined(USING_WIN_UI) - ConfigSetting("RestartRequired", &g_Config.bRestartRequired, false, false), -#endif ReportedConfigSetting("ForceMaxEmulatedFPS", &g_Config.iForceMaxEmulatedFPS, 60, true, true), // TODO: Hm, on fast mobile GPUs we should definitely default to at least 4 (setting = 2)... diff --git a/Core/Config.h b/Core/Config.h index 500a24c785..1c5acee0ec 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -113,8 +113,6 @@ public: bool bTopMost; std::string sFont; bool bIgnoreWindowsKey; - - bool bRestartRequired; #endif bool bPauseWhenMinimized; diff --git a/Windows/main.cpp b/Windows/main.cpp index e8db4483b0..84226ef0f7 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -572,10 +572,6 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin LogManager::Shutdown(); - if (g_Config.bRestartRequired) { - W32Util::ExitAndRestart(); - } - net::Shutdown(); CoUninitialize();