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

Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration.

1 files changed, 7 insertions, 0 deletions

diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp
index 1a989878f5..a5f5513d3f 100644
--- a/Source/Core/VideoCommon/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/VideoConfig.cpp
@@ -239,6 +239,13 @@ void VideoConfig::VerifyValidity()
 
 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.Load(ini_file);