diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-09-01 12:15:44 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-09-23 23:25:48 +0200 |
| commit | 3bc2b8c5e0c4213b53a974944189bdf7f8155502 (patch) | |
| tree | a5fa8b86d1942b55ba85ef78efe6ef03af515b2c /vcl/source/opengl | |
| parent | 8dc174178fae4cc98bf7b95ce44bfafc40b5f39e (diff) | |
tdf#101822 Always de-zombie the glxtest process
Make sure we wait for the glxtest process.
Change-Id: I143290b80ba83e35f8d0f95d133c25178c5fe563
Diffstat (limited to 'vcl/source/opengl')
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index e49859793a64..c302d060cd33 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -1006,14 +1006,11 @@ bool OpenGLHelper::isVCLOpenGLEnabled() bForceOpenGL = !!getenv("SAL_FORCEGL") || officecfg::Office::Common::VCL::ForceOpenGL::get(); bool bRet = false; - if (bForceOpenGL) + // always call supportsVCLOpenGL to de-zombie the glxtest child process on X11 + if (supportsVCLOpenGL() || bForceOpenGL) { bRet = true; } - else if (!supportsVCLOpenGL()) - { - bRet = false; - } else { static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL"); |