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

[Samuel Mehrbrodt (via logerrit)]

 framework/source/dispatch/closedispatcher.cxx |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 539374caa5deac788f394a54a75b6e167ab04864
Author:     Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Wed Jun 15 14:25:36 2022 +0200
Commit:     Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Wed Jun 15 20:53:45 2022 +0200

    Show start center when closing last document
    
    also when there are active UNO connections.
    
    (Behavior was different when there were active UNO connections)
    
    Change-Id: Ief37b0f362b7e2a47eccbec985ee3017c475046c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135905
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>

diff --git a/framework/source/dispatch/closedispatcher.cxx 
b/framework/source/dispatch/closedispatcher.cxx
index 19fe9ffaa69d..a6ff39d459c3 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -353,12 +353,17 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, 
LinkParamNone*, void)
             //     application or establish the backing mode now.
             //     And that depends from the dispatched URL ...
             {
-                if (bHasActiveConnections)
-                    bCloseFrame = true;
-                else if (eOperation == E_CLOSE_FRAME)
-                    bTerminateApp = true;
+                if (eOperation == E_CLOSE_FRAME)
+                {
+                    if (bHasActiveConnections)
+                        bCloseFrame = true;
+                    else
+                        bTerminateApp = true;
+                }
                 else if( 
SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::STARTMODULE) )
                     bEstablishBackingMode = true;
+                else if (bHasActiveConnections)
+                    bCloseFrame = true;
                 else
                     bTerminateApp = true;
             }