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

[Michael Meeks]

 vcl/source/opengl/OpenGLContext.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 0bc3b393c681403e1e53ef3e5b46d169d509bd8b
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Jan 6 12:10:39 2016 +0000

    vcl: opengl - if we can't get the context we want, fallback properly.
    
    Fixes crash on Linux / NVidea with GL manually enabled.
    
    We can cope with a non-double-buffered context if we have to.
    
    Change-Id: Ic7968b8576cfe0efb10718058bc69db5b4daef95

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index db51515..d70d27e 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -728,10 +728,8 @@ bool OpenGLContext::ImplInit()
     {
         int best_fbc = -1;
         GLXFBConfig* pFBC = getFBConfig(m_aGLWin.dpy, m_aGLWin.win, best_fbc, mbUseDoubleBufferedRendering, false);
-        if (!pFBC)
-            return false;
 
-        if (best_fbc != -1)
+        if (pFBC && best_fbc != -1)
         {
             int pContextAttribs[] =
             {