Skip to content

Commit 7afb435

Browse files
committed
Closes #4280.
1 parent 2e5f26c commit 7afb435

File tree

2 files changed

+26
-6
lines changed

2 files changed

+26
-6
lines changed

Rubberduck.Main/Root/RubberduckIoCInstaller.cs

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,11 @@ private void RegisterParseTreeInspections(IWindsorContainer container, Assembly[
337337

338338
private void RegisterRubberduckMenu(IWindsorContainer container)
339339
{
340-
var location = _addin.CommandBarLocations[CommandBarSite.MenuBar];
340+
if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.MenuBar, out var location))
341+
{
342+
return;
343+
}
344+
341345
var controls = MainCommandBarControls(location.ParentId);
342346
var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
343347
var menuItemTypes = RubberduckMenuItems();
@@ -403,7 +407,11 @@ private ICommandBarControls MainCommandBarControls(int commandBarIndex)
403407

404408
private void RegisterCodePaneContextMenu(IWindsorContainer container)
405409
{
406-
var location = _addin.CommandBarLocations[CommandBarSite.CodeWindow];
410+
if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.CodeWindow, out var location))
411+
{
412+
return;
413+
}
414+
407415
var controls = MainCommandBarControls(location.ParentId);
408416
var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
409417
var menuItemTypes = CodePaneContextMenuItems();
@@ -424,7 +432,11 @@ private Type[] CodePaneContextMenuItems()
424432

425433
private void RegisterFormDesignerContextMenu(IWindsorContainer container)
426434
{
427-
var location = _addin.CommandBarLocations[CommandBarSite.MsForm];
435+
if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.MsForm, out var location))
436+
{
437+
return;
438+
}
439+
428440
var controls = MainCommandBarControls(location.ParentId);
429441
var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
430442
var menuItemTypes = FormDesignerContextMenuItems();
@@ -442,7 +454,11 @@ private Type[] FormDesignerContextMenuItems()
442454

443455
private void RegisterFormDesignerControlContextMenu(IWindsorContainer container)
444456
{
445-
var location = _addin.CommandBarLocations[CommandBarSite.MsFormControl];
457+
if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.MsFormControl, out var location))
458+
{
459+
return;
460+
}
461+
446462
var controls = MainCommandBarControls(location.ParentId);
447463
var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
448464
var menuItemTypes = FormDesignerContextMenuItems();
@@ -451,7 +467,11 @@ private void RegisterFormDesignerControlContextMenu(IWindsorContainer container)
451467

452468
private void RegisterProjectExplorerContextMenu(IWindsorContainer container)
453469
{
454-
var location = _addin.CommandBarLocations[CommandBarSite.ProjectExplorer];
470+
if (!_addin.CommandBarLocations.TryGetValue(CommandBarSite.ProjectExplorer, out var location))
471+
{
472+
return;
473+
}
474+
455475
var controls = MainCommandBarControls(location.ParentId);
456476
var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
457477
var menuItemTypes = ProjectWindowContextMenuItems();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public AddIn(VB.AddIn target, bool rewrapping = false)
3030
{CommandBarSite.MenuBar, new CommandBarLocation(MenuBar, WindowMenu)},
3131
{CommandBarSite.CodeWindow, new CommandBarLocation(CodeWindow, ListProperties)},
3232
{CommandBarSite.ProjectExplorer, new CommandBarLocation(ProjectExplorer, ProjectProperties)},
33-
{CommandBarSite.MsForm, new CommandBarLocation(MsForm, UpdateUserControls)},
33+
// {CommandBarSite.MsForm, new CommandBarLocation(MsForm, UpdateUserControls)}, // FIXME - quick hack for #4280
3434
{CommandBarSite.MsFormControl, new CommandBarLocation(MsFormControl, ViewCode)}
3535
});
3636
}

0 commit comments

Comments
 (0)