[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/opengl/OpenGLHelper.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 657f2d1558827e2c886e757df893c7ca067d4e7d
Author:     Markus Mohrhard <markus.mohrh...@googlemail.com>
AuthorDate: Sat Sep 24 23:50:13 2016 +0200
Commit:     Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Jan 30 16:40:07 2019 +0100

    fix the OpenGL selection logic
    
    Now OpenGL is again not used on the build bots.
    
    Change-Id: I7369394c44ab1e16135e2b22f7f8effca0f25d3c
    (cherry picked from commit 1a4555f3b3572f398c33bffd1ed2a40705431733)
    Reviewed-on: https://gerrit.libreoffice.org/67160
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index 73d587c64744..25ef12f69623 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -993,12 +993,13 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
     bForceOpenGL = !!getenv("SAL_FORCEGL") || 
officecfg::Office::Common::VCL::ForceOpenGL::get();
 
     bool bRet = false;
+    bool bSupportsVCLOpenGL = supportsVCLOpenGL();
     // always call supportsVCLOpenGL to de-zombie the glxtest child process on 
X11
-    if (supportsVCLOpenGL() || bForceOpenGL)
+    if (bForceOpenGL)
     {
         bRet = true;
     }
-    else
+    else if (bSupportsVCLOpenGL)
     {
         static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL");
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits