old VS detection stabilization

BrokenEvent · Apr 10, 2017 · 4f90662 · 4f90662
1 parent ae8ffa5
commit 4f90662
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/VisualStudioOpener/VisualStudioDetector.cs b/VisualStudioOpener/VisualStudioDetector.cs
@@ -28,8 +28,7 @@ private static string CheckOldVisualStudio(RegistryKey key)
 
     private static IEnumerable<IVisualStudioInfo> DetectOldVisualStudios()
     {
-      RegistryKey registryHive = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32);
-
+      using (RegistryKey registryHive = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32))
       using (RegistryKey key = registryHive.OpenSubKey(@"SOFTWARE\Microsoft\VisualStudio", false))
       {
         foreach (string subKeyName in key.GetSubKeyNames())
@@ -40,6 +39,8 @@ private static IEnumerable<IVisualStudioInfo> DetectOldVisualStudios()
 
           using (RegistryKey subKey = key.OpenSubKey(subKeyName, false))
           {
+            if (subKey == null)
+              continue;
             string path = CheckOldVisualStudio(subKey);
             if (path == null || !File.Exists(path))
               continue;