Merge pull request #9319 from JosJuice/default-enabled-no-propagate

Core: Don't copy default _Enabled sections to user INIs
dolphin-emu · Dec 11, 2020 · 9bb8107 · 9bb8107
2 parents 7d9276c + 11e8783
commit 9bb8107
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp
@@ -285,10 +285,8 @@ void SaveCodes(IniFile* local_ini, const std::vector<ARCode>& codes)
 
   for (const ActionReplay::ARCode& code : codes)
   {
-    if (code.enabled)
-      enabled_lines.emplace_back('$' + code.name);
-    else if (code.default_enabled)
-      disabled_lines.emplace_back('$' + code.name);
+    if (code.enabled != code.default_enabled)
+      (code.enabled ? enabled_lines : disabled_lines).emplace_back('$' + code.name);
 
     if (code.user_defined)
     {

diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp
@@ -242,10 +242,8 @@ void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes)
 
   for (const GeckoCode& geckoCode : gcodes)
   {
-    if (geckoCode.enabled)
-      enabled_lines.emplace_back('$' + geckoCode.name);
-    else if (geckoCode.default_enabled)
-      disabled_lines.emplace_back('$' + geckoCode.name);
+    if (geckoCode.enabled != geckoCode.default_enabled)
+      (geckoCode.enabled ? enabled_lines : disabled_lines).emplace_back('$' + geckoCode.name);
 
     SaveGeckoCode(lines, geckoCode);
   }

diff --git a/Source/Core/DolphinQt/Config/PatchesWidget.cpp b/Source/Core/DolphinQt/Config/PatchesWidget.cpp
@@ -133,10 +133,8 @@ void PatchesWidget::SavePatches()
 
   for (const auto& patch : m_patches)
   {
-    if (patch.enabled)
-      lines_enabled.emplace_back('$' + patch.name);
-    else if (patch.default_enabled)
-      lines_disabled.emplace_back('$' + patch.name);
+    if (patch.enabled != patch.default_enabled)
+      (patch.enabled ? lines_enabled : lines_disabled).emplace_back('$' + patch.name);
 
     if (!patch.user_defined)
       continue;