diff options
Diffstat (limited to 'desktop/source')
| -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 { |