From 8446c9563d126f8b31b9d97b066bb9661504091a Mon Sep 17 00:00:00 2001
From: AT <14300910+theClueless@users.noreply.github.com>
Date: Sat, 16 Nov 2019 02:37:01 +0200
Subject: [PATCH] fixed lock issue

---
 Plugins/Wox.Plugin.Program/Main.cs         | 10 ++++++----
 Plugins/Wox.Plugin.Program/Programs/UWP.cs |  7 +++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Plugins/Wox.Plugin.Program/Main.cs b/Plugins/Wox.Plugin.Program/Main.cs
index 0a6f37a4a0..009dd84fbd 100644
--- a/Plugins/Wox.Plugin.Program/Main.cs
+++ b/Plugins/Wox.Plugin.Program/Main.cs
@@ -90,9 +90,10 @@ namespace Wox.Plugin.Program
 
         public static void IndexWin32Programs()
         {
+            var win32S = Win32.All(_settings);
             lock (IndexLock)
             {
-                _win32s = Win32.All(_settings);
+                _win32s = win32S;
             }
         }
 
@@ -101,17 +102,18 @@ namespace Wox.Plugin.Program
             var windows10 = new Version(10, 0);
             var support = Environment.OSVersion.Version.Major >= windows10.Major;
 
+            var applications = support ? UWP.All() : new UWP.Application[] { };
             lock (IndexLock)
             {
-                _uwps = support ? UWP.All() : new UWP.Application[] { };
+                _uwps = applications;
             }
         }
 
         public static void IndexPrograms()
         {
-            var t1 = Task.Run(() => { IndexWin32Programs(); });
+            var t1 = Task.Run(IndexWin32Programs);
 
-            var t2 = Task.Run(() => { IndexUWPPrograms(); });
+            var t2 = Task.Run(IndexUWPPrograms);
 
             Task.WaitAll(t1, t2);
 
diff --git a/Plugins/Wox.Plugin.Program/Programs/UWP.cs b/Plugins/Wox.Plugin.Program/Programs/UWP.cs
index 60f978b9dc..7a980640f0 100644
--- a/Plugins/Wox.Plugin.Program/Programs/UWP.cs
+++ b/Plugins/Wox.Plugin.Program/Programs/UWP.cs
@@ -165,9 +165,9 @@ namespace Wox.Plugin.Program.Programs
                     }
 #endif
 #if DEBUG //make developer aware and implement handling
-                    catch(Exception e)
+                    catch
                     {
-                        throw e;
+                        throw;
                     }
 #endif
                     return u.Apps;
@@ -230,8 +230,7 @@ namespace Wox.Plugin.Program.Programs
 
         public override bool Equals(object obj)
         {
-            var uwp = obj as UWP;
-            if (uwp != null)
+            if (obj is UWP uwp)
             {
                 return FamilyName.Equals(uwp.FamilyName);
             }