GetValueKind throws exception when not found

IB-7521 Signed-off-by: Raul Metsma <raul@metsma.ee>
web-eid · Sep 23, 2022 · 1ef35df · 1ef35df
1 parent a0d9549
commit 1ef35df
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/FirefoxAction.cs b/src/FirefoxAction.cs
@@ -101,6 +101,8 @@ internal static RegistryKey OpenOrCreateSubKey(this RegistryKey registryKey, str
 
         internal static string GetStringValue(this RegistryKey registryKey, string name, string defaultValue = null)
         {
+            if (!registryKey.ContainsName(name))
+                return defaultValue;
             switch (registryKey.GetValueKind(name))
             {
             case RegistryValueKind.String:
@@ -111,5 +113,15 @@ internal static string GetStringValue(this RegistryKey registryKey, string name,
             default: return defaultValue;
             }
         }
+
+        internal static bool ContainsName(this RegistryKey key, string name)
+        {
+            foreach (string value in key.GetValueNames())
+            {
+                if (value == name)
+                    return true;
+            }
+            return false;
+        }
     }
 }