[Libreoffice-commits] core.git: vcl/win

[Jan Holesovsky]

 vcl/win/source/gdi/salnativewidgets-luna.cxx |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 90adb5412f1066f53a8db339ce5aac543431617e
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Dec 3 16:57:42 2014 +0100

    windows opengl: Call PreDraw() earlier.
    
    Change-Id: I30ceb29cc0321022733385f902685ceac78869f2

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 401e0678..67c5a75 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1288,19 +1288,18 @@ bool WinSalGraphics::drawNativeControl( ControlType nType,
         if (ImplDrawNativeControl(aBlackDC.getCompatibleHDC(), hTheme, rc, nType, nPart, nState, aValue, aCaptionStr) &&
             ImplDrawNativeControl(aWhiteDC.getCompatibleHDC(), hTheme, rc, nType, nPart, nState, aValue, aCaptionStr))
         {
-            boost::scoped_ptr<OpenGLTexture> pBlackTexture(aBlackDC.getTexture());
-            if (!pBlackTexture)
-                return false;
+            pImpl->PreDraw();
 
+            boost::scoped_ptr<OpenGLTexture> pBlackTexture(aBlackDC.getTexture());
             boost::scoped_ptr<OpenGLTexture> pWhiteTexture(aWhiteDC.getTexture());
-            if (!pWhiteTexture)
-                return false;
 
-            pImpl->PreDraw();
-            pImpl->DrawTextureDiff(*pWhiteTexture, *pBlackTexture, aBlackDC.getTwoRect());
-            pImpl->PostDraw();
+            if (pBlackTexture && pWhiteTexture)
+            {
+                pImpl->DrawTextureDiff(*pWhiteTexture, *pBlackTexture, aBlackDC.getTwoRect());
+                bOk = true;
+            }
 
-            bOk = true;
+            pImpl->PostDraw();
         }
     }