ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3394 from dolphin-emu/revert-3373-temp-settings-ini-hotfix 

Revert "Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration."
This commit is contained in:
Scott Mansell 2015-12-24 21:33:22 +13:00
parent cfd300586a 0216879d3e
commit a227daac56
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/ConfigManager.cpp
View File

@ -12,7 +12,7 @@
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h" // for bWii
#include "Core/Boot/Boot.h" #include "Core/Boot/Boot.h"
#include "Core/Boot/Boot_DOL.h" #include "Core/Boot/Boot_DOL.h"
#include "Core/FifoPlayer/FifoDataFile.h" #include "Core/FifoPlayer/FifoDataFile.h"
@ -82,13 +82,6 @@ SConfig::~SConfig()
void SConfig::SaveSettings() 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()); NOTICE_LOG(BOOT, "Saving settings to %s", File::GetUserPath(F_DOLPHINCONFIG_IDX).c_str());
IniFile ini; IniFile ini;
ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); // load first to not kill unknown stuff ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); // load first to not kill unknown stuff

7
Source/Core/VideoCommon/VideoConfig.cpp
View File

@ -271,13 +271,6 @@ void VideoConfig::VerifyValidity()
void VideoConfig::Save(const std::string& ini_file) 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 iniFile;
iniFile.Load(ini_file); iniFile.Load(ini_file);