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

[Markus Mohrhard]

 vcl/source/opengl/OpenGLContext.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 33af00a9ae3136e8aa0fe3183a49681383cd48c7
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Jan 20 12:34:48 2015 +0100

    bail out early if there is no Display
    
    Change-Id: I1d724ae9346a4df7207e737cf98bf0cd7293bc2b

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 5df70f4..5bd863d 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -730,6 +730,11 @@ bool OpenGLContext::init(Display* dpy, Pixmap pix, unsigned int width, unsigned
 
 bool OpenGLContext::ImplInit()
 {
+    if (!m_aGLWin.dpy)
+    {
+        return false;
+    }
+
     GLXContext pSharedCtx( NULL );
 #ifdef DBG_UTIL
     TempErrorHandler aErrorHandler(m_aGLWin.dpy, unxErrorHandler);
@@ -767,10 +772,10 @@ bool OpenGLContext::ImplInit()
 
     if (!m_aGLWin.ctx)
     {
-        if (!m_aGLWin.dpy || !m_aGLWin.vi)
+        if (!m_aGLWin.vi)
            return false;
 
-        m_aGLWin.ctx = m_aGLWin.dpy == 0 ? 0 : glXCreateContext(m_aGLWin.dpy,
+        m_aGLWin.ctx = glXCreateContext(m_aGLWin.dpy,
                 m_aGLWin.vi,
                 pSharedCtx,
                 GL_TRUE);