piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2687 from AdmiralCurtiss/temp-settings-ini-hotfix

Browse Source 
Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration.
This commit is contained in:
Markus Wick 2015-12-02 15:34:28 +01:00
commit c55481882f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/IniFile.h" #include "Common/IniFile.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/SI.h" #include "Core/HW/SI.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "DiscIO/NANDContentLoader.h" #include "DiscIO/NANDContentLoader.h"
@ -39,6 +40,13 @@ SConfig::~SConfig()
void SConfig::SaveSettings() void SConfig::SaveSettings()
{ {
// TODO: The 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

@ -239,6 +239,13 @@ void VideoConfig::VerifyValidity()
void VideoConfig::Save(const std::string& ini_file) void VideoConfig::Save(const std::string& ini_file)
{ {
// TODO: The 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);