Potential race condition in action keyword management

Jack251970 · Jack251970 · commit fb8daa4ed90f · 2025-08-12T18:12:15.000+08:00
diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -648,14 +648,7 @@ public static void AddActionKeyword(string id, string newActionKeyword)
             }
             else
             {
-                if (_nonGlobalPlugins.TryGetValue(newActionKeyword, out var item))
-                {
-                    _nonGlobalPlugins.TryUpdate(newActionKeyword, plugin, item);
-                }
-                else
-                {
-                    _nonGlobalPlugins.TryAdd(newActionKeyword, plugin);
-                }
+                _nonGlobalPlugins.AddOrUpdate(newActionKeyword, plugin, (key, oldValue) => plugin);
             }
 
             // Update action keywords and action keyword in plugin metadata

Original file line number	Diff line number	Diff line change
`@@ -648,14 +648,7 @@ public static void AddActionKeyword(string id, string newActionKeyword)`
`648`	`648`	`}`
`649`	`649`	`else`
`650`	`650`	`{`
`651`		`- if (_nonGlobalPlugins.TryGetValue(newActionKeyword, out var item))`
`652`		`- {`
`653`		`- _nonGlobalPlugins.TryUpdate(newActionKeyword, plugin, item);`
`654`		`- }`
`655`		`- else`
`656`		`- {`
`657`		`- _nonGlobalPlugins.TryAdd(newActionKeyword, plugin);`
`658`		`- }`
	`651`	`+ _nonGlobalPlugins.AddOrUpdate(newActionKeyword, plugin, (key, oldValue) => plugin);`
`659`	`652`	`}`
`660`	`653`
`661`	`654`	`// Update action keywords and action keyword in plugin metadata`