Merge pull request #204 from lostmsu/master

* fixed memory leaks in VisibleImage
TestStack · Jan 21, 2014 · 730583d · 730583d
2 parents 74de354 + 009dd8b
commit 730583d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/TestStack.White/UIItems/UIItem.cs b/src/TestStack.White/UIItems/UIItem.cs
@@ -338,8 +338,8 @@ public virtual Bitmap VisibleImage
             get
             {
                 var displayedItem = new DisplayedItem(new IntPtr(automationElement.Current.NativeWindowHandle));
-                System.Drawing.Image image = displayedItem.GetVisibleImage();
-                return new Bitmap(image);
+                using(System.Drawing.Image image = displayedItem.GetVisibleImage())
+					return new Bitmap(image);
             }
         }
 

diff --git a/src/TestStack.White/WindowsAPI/DisplayedItem.cs b/src/TestStack.White/WindowsAPI/DisplayedItem.cs
@@ -75,11 +75,10 @@ public virtual Bitmap GetVisibleImage()
             {
                 DeleteDC(compatibleDeviceContext);
                 ReleaseDC(windowHandle, deviceContext);
-                img = Image.FromHbitmap(bitmap);
-                DeleteObject(bitmap);
+	            img = Image.FromHbitmap(bitmap);
+	            DeleteObject(bitmap);
             }
-
-            return new Bitmap(img);
+	        using (img) return new Bitmap(img);
         }
     }
 }