Index: src/DeltaShell/DeltaShell.Gui/Forms/ViewManager/ViewSelectionMouseController.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r5fc71a385897af92ccb092f2f969b5709afab85a --- src/DeltaShell/DeltaShell.Gui/Forms/ViewManager/ViewSelectionMouseController.cs (.../ViewSelectionMouseController.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ src/DeltaShell/DeltaShell.Gui/Forms/ViewManager/ViewSelectionMouseController.cs (.../ViewSelectionMouseController.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) @@ -22,22 +22,26 @@ viewList.ActiveViewChanged += ViewManagerActiveViewChanged; } + public IDockingManager DockingManager { get; private set; } + + public IViewList ViewManager { get; set; } + private void ViewManagerActiveViewChanged(object sender, ActiveViewChangeEventArgs e) { contextMenuController.ContextMenuStripValidate(null, ViewManager); } - public IDockingManager DockingManager { get; private set; } - - public IViewList ViewManager { get; set; } - private void OnViewSelectionMouseDown(object sender, MouseEventArgs e, IView selectedView) { if (!(sender is Control)) + { throw new ArgumentException(Resources.ViewSelectionMouseController_OnViewSelectionMouseDown_Sender_must_be_non_null_and_of_type_Control); + } if (!ViewManager.Contains(selectedView)) + { return; //View is not in our ViewList, don't handle this + } if (e.Button == MouseButtons.Right) {