Merge pull request #4284 from mansellan/4280

Quick hack to fix VB6 crash on certain project types

Author: bclothier

Rubberduck.Main/Root/RubberduckIoCInstaller.cs

@@ -339,7 +339,11 @@ private void RegisterParseTreeInspections(IWindsorContainer container, Assembly[
 
         private void RegisterRubberduckMenu(IWindsorContainer container)
         {
-            var location = _addin.CommandBarLocations[CommandBarSite.MenuBar];
+            if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.MenuBar, out var location))
+            {
+                return;
+            }
+
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = RubberduckMenuItems();
@@ -405,7 +409,11 @@ private ICommandBarControls MainCommandBarControls(int commandBarIndex)
 
         private void RegisterCodePaneContextMenu(IWindsorContainer container)
         {
-            var location = _addin.CommandBarLocations[CommandBarSite.CodeWindow];
+            if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.CodeWindow, out var location))
+            {
+                return;
+            }
+
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = CodePaneContextMenuItems();
@@ -426,7 +434,11 @@ private Type[] CodePaneContextMenuItems()
 
         private void RegisterFormDesignerContextMenu(IWindsorContainer container)
         {
-            var location = _addin.CommandBarLocations[CommandBarSite.MsForm];
+            if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.MsForm, out var location))
+            {
+                return;
+            }
+
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = FormDesignerContextMenuItems();
@@ -444,7 +456,11 @@ private Type[] FormDesignerContextMenuItems()
 
         private void RegisterFormDesignerControlContextMenu(IWindsorContainer container)
         {
-            var location = _addin.CommandBarLocations[CommandBarSite.MsFormControl];
+            if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.MsFormControl, out var location))
+            {
+                return;
+            }
+
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = FormDesignerContextMenuItems();
@@ -453,7 +469,11 @@ private void RegisterFormDesignerControlContextMenu(IWindsorContainer container)
 
         private void RegisterProjectExplorerContextMenu(IWindsorContainer container)
         {
-            var location = _addin.CommandBarLocations[CommandBarSite.ProjectExplorer];
+            if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.ProjectExplorer, out var location))
+            {
+                return;
+            }
+
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = ProjectWindowContextMenuItems();

Rubberduck.VBEditor.VB6/SafeComWrappers/VB/AddIn.cs

@@ -30,7 +30,7 @@ public AddIn(VB.AddIn target, bool rewrapping = false)
                 {CommandBarSite.MenuBar, new CommandBarLocation(MenuBar, WindowMenu)},
                 {CommandBarSite.CodeWindow, new CommandBarLocation(CodeWindow, ListProperties)},
                 {CommandBarSite.ProjectExplorer, new CommandBarLocation(ProjectExplorer, ProjectProperties)},
-                {CommandBarSite.MsForm, new CommandBarLocation(MsForm, UpdateUserControls)},
+                // {CommandBarSite.MsForm, new CommandBarLocation(MsForm, UpdateUserControls)}, // FIXME - quick hack for #4280
                 {CommandBarSite.MsFormControl, new CommandBarLocation(MsFormControl, ViewCode)}
             });
         }