commit ad3035fc9e30770392d5f4d955eae08d84562cde
author sergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Feb 07 21:24:04 2014
committer sergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Feb 07 21:24:04 2014
tree a4a62292c2d2673fb7e11df00b598d7da5785c4e
parent c5a839c3a986ad52526f5778b98cf5c12b8dccf9

Fix WindowCapturerWin to unselect bitmap before destroying DC.

BUG=https://code.google.com/p/webrtc/issues/detail?id=2901
R=wez@chromium.org

Review URL: https://webrtc-codereview.appspot.com/8229004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5504 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/desktop_capture/window_capturer_win.cc

diff --git a/webrtc/modules/desktop_capture/window_capturer_win.cc b/webrtc/modules/desktop_capture/window_capturer_win.cc
index 95f41db..d65c625 100644
--- a/webrtc/modules/desktop_capture/window_capturer_win.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_win.cc
@@ -201,7 +201,7 @@
   }
 
   HDC mem_dc = CreateCompatibleDC(window_dc);
-  SelectObject(mem_dc, frame->bitmap());
+  HGDIOBJ previous_object = SelectObject(mem_dc, frame->bitmap());
   BOOL result = FALSE;
 
   // When desktop composition (Aero) is enabled each window is rendered to a
@@ -231,7 +231,7 @@
                     window_dc, 0, 0, SRCCOPY);
   }
 
-  SelectObject(mem_dc, NULL);
+  SelectObject(mem_dc, previous_object);
   DeleteDC(mem_dc);
   ReleaseDC(window_, window_dc);