Merge pull request #12575 from t895/inconsistent-settings-application

frontend_common: config: Only write setting related to opened config file

1 files changed, 3 insertions, 2 deletions

diff --git a/src/frontend_common/config.cpp b/src/frontend_common/config.cpp
index 359a0d267..20de91ff4 100644
--- a/src/frontend_common/config.cpp
+++ b/src/frontend_common/config.cpp
@@ -883,9 +883,10 @@ void Config::WriteSettingGeneric(const Settings::BasicSetting* const setting) {
             WriteBooleanSetting(std::string(key).append("\\use_global"), setting->UsingGlobal());
         }
         if (global || !setting->UsingGlobal()) {
+            auto value = global ? setting->ToStringGlobal() : setting->ToString();
             WriteBooleanSetting(std::string(key).append("\\default"),
-                                setting->ToString() == setting->DefaultToString());
-            WriteStringSetting(key, setting->ToString());
+                                value == setting->DefaultToString());
+            WriteStringSetting(key, value);
         }
     } else if (global) {
         WriteBooleanSetting(std::string(key).append("\\default"),