Cleanup and logic correction

Author: bclothier

Rubberduck.Core/UI/Command/MenuItems/ParentMenus/CommandBarButtonFactory.cs

@@ -18,8 +18,9 @@ public class CommandBarButtonFactory : ICommandBarButtonFactory
         private readonly IVBEEvents _vbeEvents;
         private readonly List<CommandBarButton> _buttons;
 
-        internal CommandBarButtonFactory(IVBEEvents vbeEvents)
+        public CommandBarButtonFactory(IVBEEvents vbeEvents)
         {
+            _buttons = new List<CommandBarButton>();
             _vbeEvents = vbeEvents;
             _vbeEvents.EventsTerminated += EventsTerminated;
         }

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

@@ -13,7 +13,7 @@
 
 namespace Rubberduck.VBEditor.SafeComWrappers.Office.Core
 {
-    public class CommandBarButton : SafeEventedComWrapper<MSO.CommandBarButton, MSO.ICommandBarsEvents>, ICommandBarButton, MSO.ICommandBarButtonEvents
+    public class CommandBarButton : SafeEventedComWrapper<MSO.CommandBarButton, MSO._CommandBarButtonEvents>, ICommandBarButton, MSO._CommandBarButtonEvents
     {
         private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
         public const bool AddCommandBarControlsTemporarily = false;
@@ -371,19 +371,19 @@ public override bool Equals(ISafeComWrapper<MSO.CommandBarButton> other)
                     && ReferenceEquals(other.Target.Parent, Target.Parent));
         }
 
-        private object _eventLock = new object();
+        private readonly object _eventLock = new object();
         private event EventHandler<CommandBarButtonClickEventArgs> _click;
         public event EventHandler<CommandBarButtonClickEventArgs> Click
         {
             add
             {
                 lock (_eventLock)
                 {
-                    if (_click != null && _click.GetInvocationList().Length == 0)
+                    _click += value;
+                    if (_click != null && _click.GetInvocationList().Length != 0)
                     {
                         AttachEvents();
                     }
-                    _click += value;
                 }
             }
             remove
@@ -399,7 +399,7 @@ public event EventHandler<CommandBarButtonClickEventArgs> Click
             }
         }
 
-        void MSO.ICommandBarButtonEvents.Click(MSO.CommandBarButton Ctrl, ref bool CancelDefault)
+        void MSO._CommandBarButtonEvents.Click(MSO.CommandBarButton Ctrl, ref bool CancelDefault)
         {
             var button = new CommandBarButton(Ctrl);
             var handler = _click;