Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into next

Author: ThunderFrame

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs

@@ -111,12 +111,12 @@ public void EvaluateCanExecute(RubberduckParserState state)
         public void RemoveChildren()
         {
             // note: doing this wrecks the teardown process. counter-intuitive? sure. but hey it works.
-            //foreach (var child in _items.Values.Select(item => item as CommandBarButton).Where(child => child != null))
-            //{
-            //    child.Click -= child_Click;
+            foreach (var child in _items.Values.Select(item => item as CommandBarButton).Where(child => child != null))
+            {
+                child.Click -= child_Click;
             //    child.Delete();
             //    child.Release();
-            //}
+            }
         }
 
         // note: HAAAAACK!!!

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/RubberduckCommandBar.cs

@@ -54,7 +54,7 @@ public void SetContextSelectionCaption(string caption)
         public void Dispose()
         {
             //note: doing this wrecks the teardown process. counter-intuitive? sure. but hey it works.
-            //RemoveChildren();
+            RemoveChildren();
             //Item.Delete();
             //Item.Release(true);
         }

Rubberduck.VBEEditor/SafeComWrappers/Office.Core/CommandBarButton.cs

@@ -35,7 +35,14 @@ public event EventHandler<CommandBarButtonClickEventArgs> Click
             }
             remove
             {
-                ((Microsoft.Office.Core.CommandBarButton)Target).Click -= Target_Click;
+                try
+                {
+                    ((Microsoft.Office.Core.CommandBarButton)Target).Click -= Target_Click;
+                }
+                catch
+                {
+                    // he's gone, dave.
+                }
                 _clickHandler -= value;
             }
         }