summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-12-29 00:52:09 +0100
committerMichael Meeks <michael.meeks@collabora.com>2017-01-05 20:34:43 +0000
commitf9c3998c2260995cccce060d1226b47ac2dc8c2d (patch)
treef3a0cd5242f3375c5b6f001bb24ac9472cb0009f
parenta5f5312de639048dac65da292f2b2dcc330cee15 (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/32668 Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
-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 e464fe979e83..3e5f3a0242bc 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>
@@ -315,6 +316,10 @@ sal_Bool SAL_CALL Desktop::terminate()
/* UNSAFE AREA ------------------------------------------------------------------------------------- */
impl_sendNotifyTerminationEvent();
+ {
+ SolarMutexGuard aGuard;
+ Scheduler::ProcessEventsToIdle();
+ }
if(
( bAskQuickStart ) &&