[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-2' - vcl/source

[Markus Mohrhard]

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

New commits:
commit b308e5f45e36ec102c4388983ca8aaceb97d8da4
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Sep 7 21:13:26 2015 +0200

    avoid some OpenGL calls when vcl OpenGL is not enabled
    
    There are even more and it is causing a number of performance issues.
    This just fixes the most obvious place.
    
    Change-Id: Id85c13b5b7f4bb0bc077e62c39258067e17c0094
    Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/18441
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 978fdd7f..5893cf6 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1397,7 +1397,7 @@ bool OpenGLContext::isCurrent()
     return false;
 #elif defined( UNX )
     GLXDrawable nDrawable = mbPixmap ? m_aGLWin.glPix : m_aGLWin.win;
-    return (glXGetCurrentContext() == m_aGLWin.ctx &&
+    return (m_aGLWin.ctx && glXGetCurrentContext() == m_aGLWin.ctx &&
             glXGetCurrentDrawable() == nDrawable);
 #endif
 }