Improved com wrapper release in VBENativeServices in case of exceptions.

rubberduck-vba · Jun 15, 2018 · 6ac12aa · 6ac12aa
1 parent 9745875
commit 6ac12aa
Showing 1 changed file with 30 additions and 7 deletions.
diff --git a/Rubberduck.VBEEditor/Events/VBENativeServices.cs b/Rubberduck.VBEEditor/Events/VBENativeServices.cs
@@ -209,16 +209,27 @@ private static ICodePane GetCodePaneFromHwnd(IntPtr hwnd)
                 var caption = hwnd.GetWindowText();
                 using (var panes = _vbe.CodePanes)
                 {
+                    var foundIt = false;
                     foreach (var pane in panes)
                     {
-                        using (var window = pane.Window)
+                        try
                         {
-                            if (window.Caption.Equals(caption))
+                            using (var window = pane.Window)
                             {
-                                return pane;
+                                if (window.Caption.Equals(caption))
+                                {
+                                    foundIt = true;
+                                    return pane;
+                                }
+                            }
+                        }
+                        finally
+                        {
+                            if(!foundIt)
+                            {
+                                pane.Dispose();
                             }
                         }
-                        pane.Dispose();
                     }
 
                     return null;
@@ -243,13 +254,25 @@ private static IWindow GetWindowFromHwnd(IntPtr hwnd)
             var caption = hwnd.GetWindowText();
             using (var windows = _vbe.Windows)
             {
+                var foundIt = false;
                 foreach (var window in windows)
                 {
-                    if (window.Caption.Equals(caption))
+                    try
                     {
-                        return window;
+                        if (window.Caption.Equals(caption))
+                        {
+                            foundIt = true;
+                            return window;
+                        }
+
+                    }
+                    finally
+                    {
+                        if (!foundIt)
+                        {
+                            window.Dispose();
+                        }
                     }
-                    window.Dispose();
                 }
                 return null;
             }