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

[Jan-Marek Glogowski (via logerrit)]

 framework/source/services/desktop.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 908b0deb84c4a09c5afdcf70ef407382a6e4d7b2
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Tue Mar 17 12:10:47 2020 +0100
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Tue Mar 17 14:04:49 2020 +0100

    tdf#127205 call shutdown in terminate, if not exec
    
    When generating a new profile, LO shuts down the desktop without
    even running the main loop via Application::Execute, so this won't
    call Application::Shutdown() at the end of Application::Execute.
    
    So detect this case and call shutdown() directly, if LO doesn't
    run the main loop.
    
    Change-Id: Iae39a4122577b05caa787fc74c1fa7e3f71bf390
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90612
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Jenkins

diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index acf422ac9760..260ddcb5dd43 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -317,7 +317,9 @@ sal_Bool SAL_CALL Desktop::terminate()
         if ( xPipeTerminator.is() )
             xPipeTerminator->notifyTermination( aEvent );
 
-        // further termination is postponed to shutdown
+        // further termination is postponed to shutdown, if LO already runs the main loop
+        if (!Application::IsInExecute())
+            shutdown();
     }
     else
         m_bIsShutdown = true;