Remove plugins from global & non-global plugins when they are removed from settings

Jack251970 · Jack251970 · commit b85b2ec30ab5 · 2025-07-06T16:45:44.000+08:00
diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -700,6 +700,14 @@ internal static async Task UninstallPluginAsync(PluginMetadata plugin, bool remo
                 }
                 Settings.RemovePluginSettings(plugin.ID);
                 AllPlugins.RemoveAll(p => p.Metadata.ID == plugin.ID);
+                foreach (var globalPlugin in GlobalPlugins.Where(p => p.Metadata.ID == plugin.ID))
+                {
+                    GlobalPlugins.Remove(globalPlugin);
+                }
+                foreach (var key in NonGlobalPlugins.Where(p => p.Value.Metadata.ID == plugin.ID).Select(p => p.Key))
+                {
+                    NonGlobalPlugins.Remove(key);
+                }
             }
 
             // Marked for deletion. Will be deleted on next start up

Original file line number	Diff line number	Diff line change
`@@ -700,6 +700,14 @@ internal static async Task UninstallPluginAsync(PluginMetadata plugin, bool remo`
`700`	`700`	`}`
`701`	`701`	`Settings.RemovePluginSettings(plugin.ID);`
`702`	`702`	`AllPlugins.RemoveAll(p => p.Metadata.ID == plugin.ID);`
	`703`	`+ foreach (var globalPlugin in GlobalPlugins.Where(p => p.Metadata.ID == plugin.ID))`
	`704`	`+ {`
	`705`	`+ GlobalPlugins.Remove(globalPlugin);`
	`706`	`+ }`
	`707`	`+ foreach (var key in NonGlobalPlugins.Where(p => p.Value.Metadata.ID == plugin.ID).Select(p => p.Key))`
	`708`	`+ {`
	`709`	`+ NonGlobalPlugins.Remove(key);`
	`710`	`+ }`
`703`	`711`	`}`
`704`	`712`
`705`	`713`	`// Marked for deletion. Will be deleted on next start up`