*actually* fixed double-firing of click handlers

Author: retailcoder

RetailCoder.VBE/UI/Command/MenuItems/CodePaneRefactorRenameCommandMenuItem.cs

@@ -1,4 +1,3 @@
-using System.Windows.Input;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 

RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

@@ -151,7 +151,7 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)
             child.ApplyIcon();
 
             child.BeginsGroup = item.BeginGroup;
-            child.Tag = item.GetType().FullName;
+            child.Tag = Item.Parent.Name + "::" + Item.Tag + "::" + item.GetType().Name;
             child.Caption = item.Caption.Invoke();
             var command = item.Command; // todo: add 'ShortcutText' to a new 'interface CommandBase : System.Windows.Input.CommandBase'
             child.ShortcutText = command != null
@@ -162,21 +162,14 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)
             return child;
         }
 
-        // note: HAAAAACK!!!
-        private static int? _lastHashCode;
-
         private void child_Click(object sender, CommandBarButtonClickEventArgs e)
         {
-            var item = _items.Select(kvp => kvp.Key).SingleOrDefault(menu => menu.GetType().FullName == e.Control.Tag) as ICommandMenuItem;
-            if (item == null || (_lastHashCode.HasValue && e.Control.Target.GetHashCode() != _lastHashCode.Value))
+            var item = _items.Select(kvp => kvp.Key).SingleOrDefault(menu => e.Control.Tag.EndsWith(menu.GetType().Name)) as ICommandMenuItem;
+            if (item == null)
             {
                 return;
             }
 
-            // without this hack, handler runs once for each menu item that's hooked up to the command.
-            // hash code is different on every frakkin' click. go figure. I've had it, this is the fix.
-            _lastHashCode = e.Control.Target.GetHashCode();
-
             Logger.Debug("({0}) Executing click handler for menu item '{1}', hash code {2}", GetHashCode(), e.Control.Caption, e.Control.Target.GetHashCode());
             item.Command.Execute(null);
         }

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

@@ -32,6 +32,7 @@ public event EventHandler<CommandBarButtonClickEventArgs> Click
             {
                 ((Microsoft.Office.Core.CommandBarButton)Target).Click += Target_Click;
                 _clickHandler += value;
+                System.Diagnostics.Debug.WriteLine("Added handler for: {0} '{1}' (tag: {2}, hashcode:{3})", Parent.Name, Target.Caption, Tag, Target.GetHashCode());
             }
             remove
             {
@@ -44,6 +45,7 @@ public event EventHandler<CommandBarButtonClickEventArgs> Click
                     // he's gone, dave.
                 }
                 _clickHandler -= value;
+                System.Diagnostics.Debug.WriteLine("Removed handler for: {0} '{1}' (tag: {2}, hashcode:{3})", Parent.GetType().Name, Target.Caption, Tag, Target.GetHashCode());
             }
         }
 
@@ -54,9 +56,11 @@ private void Target_Click(Microsoft.Office.Core.CommandBarButton ctrl, ref bool
             {
                 return;
             }
-            
+
+            System.Diagnostics.Debug.Assert(handler.GetInvocationList().Length == 1, "Multicast delegate is registered more than once.");
+
             //note: event is fired for every parent the command exists under. not sure why.
-            //System.Diagnostics.Debug.WriteLine("Target_Click: {0} '{1}' (tag: {2}, hashcode:{3})", Parent.Name, Target.Caption, Tag, Target.GetHashCode());
+            System.Diagnostics.Debug.WriteLine("Executing handler for: {0} '{1}' (tag: {2}, hashcode:{3})", Parent.GetType().Name, Target.Caption, Tag, Target.GetHashCode());
 
             var button = new CommandBarButton(ctrl);
             var args = new CommandBarButtonClickEventArgs(button);