From 5b0f3cf836054da94968eddffc2647b50236739e Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Thu, 19 Mar 2015 20:24:07 +0100
Subject: opengl dr.memory: DC that contains selected object being deleted.

Change-Id: I3cfb09eacfa129a92dace47fd26ccf6e5d1a6756
---
 vcl/win/source/gdi/salgdi.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'vcl/win')

diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index fc74d0567779..ff74b0f5546f 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -582,13 +582,14 @@ OpenGLCompatibleDC::OpenGLCompatibleDC(SalGraphics &rGraphics, int x, int y, int
 
     mhBitmap = WinSalVirtualDevice::ImplCreateVirDevBitmap(mhCompatibleDC, width, height, 32, reinterpret_cast<void **>(&mpData));
 
-    SelectObject(mhCompatibleDC, mhBitmap);
+    mhOrigBitmap = (HBITMAP) SelectObject(mhCompatibleDC, mhBitmap);
 }
 
 OpenGLCompatibleDC::~OpenGLCompatibleDC()
 {
     if (mpImpl)
     {
+        SelectObject(mhCompatibleDC, mhOrigBitmap);
         DeleteObject(mhBitmap);
         DeleteDC(mhCompatibleDC);
     }
-- 
cgit