Makes AllPlugins single tone thread safe (#10121)

microsoft · Mar 9, 2021 · 964286a · 964286a
1 parent 38eb6ad
commit 964286a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs b/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs
@@ -24,6 +24,7 @@ public static class PluginManager
     {
         private static readonly IFileSystem FileSystem = new FileSystem();
         private static readonly IDirectory Directory = FileSystem.Directory;
+        private static readonly object AllPluginsLock = new object();
 
         private static IEnumerable<PluginPair> _contextMenuPlugins = new List<PluginPair>();
 
@@ -44,7 +45,13 @@ public static List<PluginPair> AllPlugins
             {
                 if (_allPlugins == null)
                 {
-                    _allPlugins = PluginsLoader.Plugins(PluginConfig.Parse(Directories));
+                    lock (AllPluginsLock)
+                    {
+                        if (_allPlugins == null)
+                        {
+                            _allPlugins = PluginsLoader.Plugins(PluginConfig.Parse(Directories));
+                        }
+                    }
                 }
 
                 return _allPlugins;

diff --git a/src/modules/launcher/PowerLauncher/Plugin/PluginsLoader.cs b/src/modules/launcher/PowerLauncher/Plugin/PluginsLoader.cs
@@ -27,7 +27,9 @@ public static List<PluginPair> Plugins(List<PluginMetadata> metadatas)
         public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> source)
         {
             var plugins = new List<PluginPair>();
-            var metadatas = source.Where(o => o.Language.ToUpperInvariant() == AllowedLanguage.CSharp);
+            var metadatas = source
+                .Where(o => o.Language.ToUpperInvariant() == AllowedLanguage.CSharp)
+                .ToList();
 
             foreach (var metadata in metadatas)
             {