From 0216879d3eeca4b4aeeaf1f54f97e271f33115c9 Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Thu, 24 Dec 2015 18:25:22 +1300 Subject: [PATCH] Revert "Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration." --- Source/Core/Core/ConfigManager.cpp | 9 +-------- Source/Core/VideoCommon/VideoConfig.cpp | 7 ------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index d70daf08c9..db933bceaf 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -12,7 +12,7 @@ #include "Common/StringUtil.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" +#include "Core/Core.h" // for bWii #include "Core/Boot/Boot.h" #include "Core/Boot/Boot_DOL.h" #include "Core/FifoPlayer/FifoDataFile.h" @@ -82,13 +82,6 @@ SConfig::~SConfig() void SConfig::SaveSettings() { - // TODO: This is a hotfix to prevent writing of temporary per-game settings - // (GameINI, Movie, Netplay, ...) to the global Dolphin configuration file. - // The Config logic should be rewritten instead so that per-game settings - // aren't stored in the same configuration as the actual user settings. - if (Core::IsRunning()) - return; - NOTICE_LOG(BOOT, "Saving settings to %s", File::GetUserPath(F_DOLPHINCONFIG_IDX).c_str()); IniFile ini; ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); // load first to not kill unknown stuff diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 2db0cc7633..3f0b40d012 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -271,13 +271,6 @@ void VideoConfig::VerifyValidity() void VideoConfig::Save(const std::string& ini_file) { - // TODO: This is a hotfix to prevent writing of temporary per-game settings - // (GameINI, Movie, Netplay, ...) to the global Dolphin configuration file. - // The Config logic should be rewritten instead so that per-game settings - // aren't stored in the same configuration as the actual user settings. - if (Core::IsRunning()) - return; - IniFile iniFile; iniFile.Load(ini_file);