[Libreoffice-commits] core.git: framework/source

Markus Mohrhard markus.mohrhard at googlemail.com
Thu Dec 29 18:22:30 UTC 2016


 framework/source/services/desktop.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit db1726216ba200c8a55c23a9d8c2ffd2066263a7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Dec 29 00:52:09 2016 +0100

    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 at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index fffaa76..9ab71a9 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      ) &&


More information about the Libreoffice-commits mailing list