summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-12-29 00:52:09 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-01-05 19:38:08 +0000
commitcdd309c23de58af306450edfac5d3e74e5c2a913 (patch)
treef802245aa69262ee35790fd2e63b6b70d6ade891 /framework
parentd321ba87f5ab67f939034c59846d2a3d0ab7e9b4 (diff)
process all outstanding events before shutdown, tdf#104969, tdf#104286, tdf#104399
Change-Id: Id09c3dfdc94c430d5dcb2aebb017f17db80f17e6 Reviewed-on: https://gerrit.libreoffice.org/32486 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/32667
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/desktop.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index e069905bb15a..2ee7336c0927 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -63,6 +63,7 @@
#include <rtl/instance.hxx>
#include <vcl/svapp.hxx>
#include <desktop/crashreport.hxx>
+#include <vcl/scheduler.hxx>
#include <tools/errinf.hxx>
#include <unotools/configmgr.hxx>
@@ -324,6 +325,10 @@ sal_Bool SAL_CALL Desktop::terminate()
/* UNSAFE AREA ------------------------------------------------------------------------------------- */
impl_sendNotifyTerminationEvent();
+ {
+ SolarMutexGuard aGuard;
+ Scheduler::ProcessEventsToIdle();
+ }
if(
( bAskQuickStart ) &&