diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-12-07 12:51:54 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-12-08 10:08:28 +0100 |
| commit | b7384249db1446cdbbd1f98d4c90c8d8d22c69b3 (patch) | |
| tree | 6a1e3ad84d77f59521935c98b2b9613cd3d4df27 | |
| parent | 8932cc857f62be4073a7de69491b1fd8565c44aa (diff) | |
reap glxtest process early in soffice_main unconditionally
With the VCL OpenGL backend code removal also isVCLOpenGLEnabled()
will be removed, so there won't be anything to call this. And
reaching this point in soffice_main takes long enough for the call
to be non-blocking, so there's no good reason to delay it anyway.
Change-Id: I8f7fee3d8d53bd632672afd8e8941ee7f922f8e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107361
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
| -rw-r--r-- | desktop/source/app/app.cxx | 7 | ||||
| -rw-r--r-- | include/vcl/glxtestprocess.hxx | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c54aea9dd4f7..112be4caf94d 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1548,11 +1548,8 @@ int Desktop::Main() CheckOpenCLCompute(xDesktop); #endif - // In headless mode, reap the process started by fire_glxtest_process() early in soffice_main - // (desktop/source/app/sofficemain.cxx). - if (rCmdLineArgs.IsHeadless()) { - reap_glxtest_process(); - } + // Reap the process started by fire_glxtest_process(). + reap_glxtest_process(); // Release solar mutex just before we wait for our client to connect { diff --git a/include/vcl/glxtestprocess.hxx b/include/vcl/glxtestprocess.hxx index c64d9f620b55..c8668a69d50f 100644 --- a/include/vcl/glxtestprocess.hxx +++ b/include/vcl/glxtestprocess.hxx @@ -16,9 +16,7 @@ && HAVE_FEATURE_OPENGL /* Run test for OpenGL support in own process to avoid crash with broken * OpenGL drivers. Start process as early as possible. - * In non-headless mode, the process will be reaped in X11OpenGLDeviceInfo::GetData - * (vcl/opengl/x11/X11DeviceInfo.cxx). In headless mode, the process will be reaped late in - * Desktop::Main (desktop/source/app/app.cxx). + * The process will be reaped late in Desktop::Main (desktop/source/app/app.cxx). */ bool fire_glxtest_process(); |