summaryrefslogtreecommitdiff
path: root/editors/libreoffice/files/patch-desktop_source_app_app.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'editors/libreoffice/files/patch-desktop_source_app_app.cxx')
-rw-r--r--editors/libreoffice/files/patch-desktop_source_app_app.cxx21
1 files changed, 21 insertions, 0 deletions
diff --git a/editors/libreoffice/files/patch-desktop_source_app_app.cxx b/editors/libreoffice/files/patch-desktop_source_app_app.cxx
new file mode 100644
index 000000000000..0dbece6df9f0
--- /dev/null
+++ b/editors/libreoffice/files/patch-desktop_source_app_app.cxx
@@ -0,0 +1,21 @@
+--- desktop/source/app/app.cxx.orig
++++ desktop/source/app/app.cxx
+@@ -564,6 +564,7 @@ void Desktop::InitFinished()
+
+ void Desktop::DeInit()
+ {
++ const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs();
+ try {
+ // instead of removing of the configManager just let it commit all the changes
+ utl::ConfigManager::storeConfigItems();
+@@ -580,7 +581,9 @@ void Desktop::DeInit()
+ // clear lockfile
+ m_xLockfile.reset();
+
+- RequestHandler::Disable();
++ if ( !rCmdLineArgs.GetUnknown().isEmpty()
++ || rCmdLineArgs.IsHelp() || rCmdLineArgs.IsVersion() )
++ RequestHandler::Disable();
+ if( pSignalHandler )
+ osl_removeSignalHandler( pSignalHandler );
+ } catch (const RuntimeException&) {