diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-04-07 13:10:01 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-04-07 14:46:03 +0200 |
| commit | 43b8ee70fcedfb1a2c3ef996cea4842e06e020b0 (patch) | |
| tree | 2869399399a370ac083b675d58e8b2772b14d5cd /desktop | |
| parent | f1c7aa5267a8045892890954df3c269a3abaab99 (diff) | |
reap the glxtest child even if OpenGL is not used
E.g. with Skia enabled (thus blocking OpenGL) the zombie stays around.
Change-Id: I9769ec804e4727189bbfe58d415e8ad3a6b234ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91811
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 9 |
2 files changed, 1 insertions, 13 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c00885433eac..2fb7b048231f 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1558,13 +1558,10 @@ int Desktop::Main() #endif // In headless mode, reap the process started by fire_glxtest_process() early in soffice_main - // (desktop/source/app/sofficemain.cxx), in a code block that needs to be covered by the same - // #if condition as this code block: -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && HAVE_FEATURE_UI && HAVE_FEATURE_OPENGL + // (desktop/source/app/sofficemain.cxx). if (rCmdLineArgs.IsHeadless()) { reap_glxtest_process(); } -#endif // Release solar mutex just before we wait for our client to connect { diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 90e322260c1e..d95356fd255d 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -59,17 +59,8 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main() CrashReporter::installExceptionHandler(); #endif -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && HAVE_FEATURE_UI && 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), in a code block that needs to be covered by the - * same #if condition as this code block. - */ bool bSuccess = fire_glxtest_process(); SAL_WARN_IF(!bSuccess, "desktop.opengl", "problems with glxtest"); -#endif #if defined ANDROID try { |