Merge pull request #9 from geforce-hisa0904/feature/reg

GetAppsUseTheme refactoring
Kyome22 · Aug 15, 2020 · f465e1c · f465e1c
2 parents da97286 + 7f74999
commit f465e1c
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/RunCat/Program.cs b/RunCat/Program.cs
@@ -73,18 +73,17 @@ public RunCatApplicationContext()
         private string GetAppsUseTheme()
         {
             string keyName = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize";
-            try
+            using (RegistryKey rKey = Registry.CurrentUser.OpenSubKey(keyName))
             {
-                RegistryKey rKey = Registry.CurrentUser.OpenSubKey(keyName);
-                int theme = (int)rKey.GetValue("SystemUsesLightTheme");
-                rKey.Close();
+                object value;
+                if (rKey == null || (value = rKey.GetValue("SystemUsesLightTheme")) == null)
+                {
+                    Console.WriteLine("Oh No! Couldn't get theme light/dark");
+                    return "light";
+                }
+                int theme = (int)value;
                 return theme == 0 ? "dark" : "light";
             }
-            catch (NullReferenceException)
-            {
-                Console.WriteLine("Oh No! Couldn't get theme light/dark");
-                return "light";
-            }
         }
 
         private void SetIcons()