Fix version formatting, review comment.

rubberduck-vba · Nov 14, 2018 · adae41a · adae41a
1 parent 76cfd9a
commit adae41a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 24 deletions.
diff --git a/Rubberduck.VBEEditor/VBERuntime/Settings/VBESettings.cs b/Rubberduck.VBEEditor/VBERuntime/Settings/VBESettings.cs
@@ -26,7 +26,7 @@ public VbeSettings(IVBE vbe, IRegistryWrapper registry)
                 {
                     case DllVersion.Vbe7:
                     case DllVersion.Vbe6:
-                        _activeRegistryRootPath = string.Format(VbeSettingPathTemplate, vbe.Version);
+                        _activeRegistryRootPath = string.Format(VbeSettingPathTemplate, vbe.Version.Substring(0, 3));
                         break;
                     case DllVersion.Vb98:
                         _activeRegistryRootPath = Vb6SettingPath;

diff --git a/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApiAccessor.cs b/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApiAccessor.cs
@@ -47,38 +47,21 @@ private static IVbeNativeApi InitializeRuntime()
 
         private static IVbeNativeApi DetermineVersion()
         {
-            IVbeNativeApi runtime;
-            try
-            {
-                runtime = new VbeNativeApi7();
-                runtime.GetTimer();
-                _version = DllVersion.Vbe7;
-            }
-            catch
+            foreach (var type in new[] {typeof(VbeNativeApi7), typeof(VbeNativeApi6), typeof(Vb6NativeApi)})
             {
                 try
                 {
-                    runtime = new VbeNativeApi6();
+                    var runtime = (IVbeNativeApi)Activator.CreateInstance(type);
                     runtime.GetTimer();
-                    _version = DllVersion.Vbe6;
+                    return runtime;
                 }
                 catch
                 {
-                    try
-                    {
-                        runtime = new Vb6NativeApi();
-                        runtime.GetTimer();
-                        _version = DllVersion.Vb98;
-                    }
-                    catch
-                    {
-                        // we shouldn't be here.... Rubberduck is a VBA add-in, so how the heck could it have loaded without a VBE dll?!?
-                        throw new InvalidOperationException("Cannot execute DoEvents; the VBE dll could not be located.");
-                    }
+                    // ignored
                 }
             }
-
-            return _version != DllVersion.Unknown ? runtime : null;
+            // we shouldn't be here.... Rubberduck is a VBA add-in, so how the heck could it have loaded without a VBE dll?!?
+            throw new InvalidOperationException("Cannot execute DoEvents; the VBE dll could not be located.");
         }
 
         public string DllName => _runtime.DllName;