vcl/source/opengl/OpenGLHelper.cxx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 9975ea97db2ebd6723c4617e093dc88071b3a0a7
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Thu Sep 1 12:15:44 2016 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Thu Jan 24 13:32:52 2019 +0100
tdf#101822 Always de-zombie the glxtest process
Make sure we wait for the glxtest process.
Change-Id: I143290b80ba83e35f8d0f95d133c25178c5fe563
(cherry picked from commit 3bc2b8c5e0c4213b53a974944189bdf7f8155502)
Reviewed-on: https://gerrit.libreoffice.org/66854
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 12f6151048f7..73d587c64744 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -993,14 +993,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");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
