summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-25 13:08:47 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-25 13:09:37 +0100
commita10fc29879faf726eaf0a3d3348b14a455eac75e (patch)
tree7e4aef1cacb88750def2d39df87a5d6289169bbe /desktop/source
parentc19853cd874b0a8b628e808c7d7680360cfe4d2b (diff)
Make XRestartmanager.requestRestart work from inside Desktop::Execute
Change-Id: I285f4ea088c08139593d0daad9a36a755985dec6
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/app/app.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 205965adc8a7..bbbe2280ff9a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1731,6 +1731,9 @@ int Desktop::doShutdown()
if( ! pExecGlobals )
return EXIT_SUCCESS;
+ pExecGlobals->bRestartRequested = pExecGlobals->bRestartRequested ||
+ OfficeRestartManager::get(comphelper::getProcessComponentContext())->
+ isRestartRequested(true);
if ( pExecGlobals->bRestartRequested )
SetRestartState();