Removed condition judgment using NullReferenceException

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