Changes following PR comments and SE chat

rubberduck-vba · Apr 17, 2018 · 4e5aff0 · 4e5aff0
1 parent 9137972
commit 4e5aff0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 45 deletions.
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/SafeRedirectedEventedComWrapper.cs b/Rubberduck.VBEEditor/SafeComWrappers/SafeRedirectedEventedComWrapper.cs
@@ -11,9 +11,9 @@ public abstract class SafeRedirectedEventedComWrapper<TSource, TEventSource, TEv
     {
         private const int NotAdvising = 0;
         private readonly object _lock = new object();
+        private TEventSource _eventSource; // The event source
         private IConnectionPoint _icp; // The connection point
         private int _cookie = NotAdvising;     // The cookie for the connection
-        private readonly TEventSource _eventSource;
 
         protected SafeRedirectedEventedComWrapper(TSource target, TEventSource eventSource, bool rewrapping = false) : base(target, rewrapping)
         {
@@ -23,7 +23,6 @@ protected SafeRedirectedEventedComWrapper(TSource target, TEventSource eventSour
         protected override void Dispose(bool disposing)
         {
             DetachEvents();
-            Marshal.ReleaseComObject(_eventSource);
             base.Dispose(disposing);
         }
 
@@ -75,7 +74,9 @@ public void DetachEvents()
                 }
 
                 Marshal.ReleaseComObject(_icp);
+                Marshal.ReleaseComObject(_eventSource);
                 _icp = null;
+                _eventSource = null;
             }
         }
     }

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/Office/CommandBarButton.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/Office/CommandBarButton.cs
@@ -107,50 +107,11 @@ public void ApplyIcon()
                 return;
             }
 
-            if (!HasPictureProperty)
+            using (var image = CreateTransparentImage(Picture))
             {
-                using (var image = CreateTransparentImage(Picture))
-                {
-                    Clipboard.SetImage(image);
-                    Button.PasteFace();
-                    Clipboard.Clear();
-                }
-                return;
-            }            
-        }
-
-        private bool? _hasPictureProperty;
-        private bool HasPictureProperty
-        {
-            get
-            {
-                if (IsWrappingNullReference)
-                {
-                    return false;
-                }
-
-                if (_hasPictureProperty.HasValue)
-                {
-                    return _hasPictureProperty.Value;
-                }
-
-                try
-                {
-                    dynamic button = Button;
-                    var picture = button.Picture;
-                    _hasPictureProperty = true;
-                }
-                catch (RuntimeBinderException)
-                {
-                    _hasPictureProperty = false;
-                }
-
-                catch (COMException)
-                {
-                    _hasPictureProperty = false;
-                }
-
-                return _hasPictureProperty.Value;
+                Clipboard.SetImage(image);
+                Button.PasteFace();
+                Clipboard.Clear();
             }
         }