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

[Caolán McNamara]

 vcl/opengl/win/gdiimpl.cxx |    2 +-
 vcl/opengl/x11/gdiimpl.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fdefa97e0c0a97fc23bcc28e9d734f22dcac2c7d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 20 10:59:11 2016 +0000

    Related: tdf#104705 an effort to address crash
    
    Change-Id: I43284c19d0f38fb8fbd7e908c5d255cdfd399015
    Reviewed-on: https://gerrit.libreoffice.org/32222
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 89e595c..ce61676 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -77,7 +77,7 @@ void WinOpenGLContext::resetCurrent()
 bool WinOpenGLContext::isCurrent()
 {
     OpenGLZone aZone;
-    return m_aGLWin.hRC && wglGetCurrentContext() == m_aGLWin.hRC &&
+    return g_bAnyCurrent && m_aGLWin.hRC && wglGetCurrentContext() == m_aGLWin.hRC &&
            wglGetCurrentDC() == m_aGLWin.hDC;
 }
 
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index d46b002..164fc71 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -232,7 +232,7 @@ void X11OpenGLContext::resetCurrent()
 bool X11OpenGLContext::isCurrent()
 {
     OpenGLZone aZone;
-    return m_aGLWin.ctx && glXGetCurrentContext() == m_aGLWin.ctx &&
+    return g_bAnyCurrent && m_aGLWin.ctx && glXGetCurrentContext() == m_aGLWin.ctx &&
            glXGetCurrentDrawable() == m_aGLWin.win;
 }