update plugins settings with changes (#10064)

microsoft · Mar 5, 2021 · 0c3f8af · 0c3f8af
1 parent e66db5c
commit 0c3f8af
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/modules/launcher/PowerLauncher/SettingsWatcher.cs b/src/modules/launcher/PowerLauncher/SettingsWatcher.cs
@@ -75,10 +75,10 @@ public void OverloadSettings()
 
                     var overloadSettings = _settingsUtils.GetSettingsOrDefault<PowerLauncherSettings>(PowerLauncherSettings.ModuleName);
 
-                    if (overloadSettings.Plugins == null || !overloadSettings.Plugins.Any())
+                    if (overloadSettings.Plugins == null || overloadSettings.Plugins.Count() != PluginManager.AllPlugins.Count)
                     {
                         // Needed to be consistent with old settings
-                        overloadSettings.Plugins = GetDefaultPluginsSettings();
+                        overloadSettings.Plugins = CombineWithDefaultSettings(overloadSettings.Plugins);
                         _settingsUtils.SaveSettings(overloadSettings.ToJsonString(), PowerLauncherSettings.ModuleName);
                     }
                     else
@@ -173,6 +173,20 @@ private static string ConvertHotkey(HotkeySettings hotkey)
             return model.ToString();
         }
 
+        private static List<PowerLauncherPluginSettings> CombineWithDefaultSettings(IEnumerable<PowerLauncherPluginSettings> plugins)
+        {
+            var results = GetDefaultPluginsSettings().ToDictionary(x => x.Id);
+            foreach (var plugin in plugins)
+            {
+                if (results.ContainsKey(plugin.Id))
+                {
+                    results[plugin.Id] = plugin;
+                }
+            }
+
+            return results.Values.ToList();
+        }
+
         private static IEnumerable<PowerLauncherPluginSettings> GetDefaultPluginsSettings()
         {
             return PluginManager.AllPlugins.Select(x => new PowerLauncherPluginSettings()