Kaydet (Commit) 3bc2b8c5 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski

tdf#101822 Always de-zombie the glxtest process

Make sure we wait for the glxtest process.

Change-Id: I143290b80ba83e35f8d0f95d133c25178c5fe563
üst 8dc17417
...@@ -1006,14 +1006,11 @@ bool OpenGLHelper::isVCLOpenGLEnabled() ...@@ -1006,14 +1006,11 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
bForceOpenGL = !!getenv("SAL_FORCEGL") || officecfg::Office::Common::VCL::ForceOpenGL::get(); bForceOpenGL = !!getenv("SAL_FORCEGL") || officecfg::Office::Common::VCL::ForceOpenGL::get();
bool bRet = false; bool bRet = false;
if (bForceOpenGL) // always call supportsVCLOpenGL to de-zombie the glxtest child process on X11
if (supportsVCLOpenGL() || bForceOpenGL)
{ {
bRet = true; bRet = true;
} }
else if (!supportsVCLOpenGL())
{
bRet = false;
}
else else
{ {
static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL"); static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment