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

Caolán McNamara caolanm at redhat.com
Thu Dec 8 15:24:51 UTC 2016


 vcl/opengl/win/gdiimpl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 228ae90e9f2726195e48dbb0eba2320b6ead396d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 8 15:20:25 2016 +0000

    model the WinOpenGLContext::isCurrent like the X11OpenGLContext::isCurrent
    
    i.e. if !m_aGLWin.hRC then we're definitely not a current context
    
    Change-Id: Id35f75c19629a17b714edf6aa6628d8f5b2f8ced

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 3f5da83..483a233 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -76,7 +76,7 @@ void WinOpenGLContext::resetCurrent()
 bool WinOpenGLContext::isCurrent()
 {
     OpenGLZone aZone;
-    return wglGetCurrentContext() == m_aGLWin.hRC &&
+    return m_aGLWin.hRC && wglGetCurrentContext() == m_aGLWin.hRC &&
            wglGetCurrentDC() == m_aGLWin.hDC;
 }
 


More information about the Libreoffice-commits mailing list