[Libreoffice-commits] core.git: desktop/source include/vcl

[Luboš Luňák (via logerrit)]

 desktop/source/app/app.cxx     |    7 ++-----
 include/vcl/glxtestprocess.hxx |    4 +---
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit b7384249db1446cdbbd1f98d4c90c8d8d22c69b3
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Dec 7 12:51:54 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Dec 8 10:08:28 2020 +0100

    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 at collabora.com>

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();