From 0e85c472379f7c4328dc44878388bb1b311f6f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 10 Jun 2017 20:24:18 +0200 Subject: [PATCH 1/2] VideoConfig: Remove manual panic alert setting load This code hadn't been touched since 2010. Nowadays, the panic alert setting is loaded by ConfigManager and applied in UICommon. VideoConfig has no business messing with it. --- Source/Core/VideoCommon/VideoConfig.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 619b8212b5..1011ec6c95 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -159,14 +159,6 @@ void VideoConfig::Refresh() } } - // Load common settings - IniFile iniFile; - iniFile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); - IniFile::Section* interface = iniFile.GetOrCreateSection("Interface"); - bool bTmp; - interface->Get("UsePanicHandlers", &bTmp, true); - SetEnableAlert(bTmp); - VerifyValidity(); } From 774587cbd1809e3d42db49031595f11edc38badb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 10 Jun 2017 20:25:27 +0200 Subject: [PATCH 2/2] VideoConfig: Remove useless header includes --- Source/Core/VideoCommon/VideoConfig.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 1011ec6c95..04ce2d24a0 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -3,15 +3,9 @@ // Refer to the license.txt file included. #include -#include #include "Common/CommonTypes.h" -#include "Common/FileUtil.h" -#include "Common/IniFile.h" -#include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "Core/Config/GraphicsSettings.h" -#include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Movie.h" #include "VideoCommon/OnScreenDisplay.h"