[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - wsd/DocumentBroker.cpp

Pranav Kant pranavk at collabora.co.uk
Tue Jan 30 11:53:32 UTC 2018


 wsd/DocumentBroker.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c3af95698ab26a993b20f3252005d8c2f26ec8d
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Jun 1 18:16:20 2017 +0530

    Don't be so rude
    
    If we are rude, then we don't tell the reason behind closing the
    document to our clients.
    
    This method earlier was used to do 'ownertermination', but without this
    patch, ownertermination is not going to work. We regressed somewhere in
    the past.
    
    Change-Id: I7a2513e567f72b1adf00d5a74b118e116d6d99d3
    (cherry picked from commit d6ef241cf581f981a0b7a7cfcd60f0e62546e633)
    Reviewed-on: https://gerrit.libreoffice.org/48670
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 6dd12f1c..cb0e4648 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1411,7 +1411,7 @@ void DocumentBroker::closeDocument(const std::string& reason)
     assertCorrectThread();
 
     LOG_DBG("Closing DocumentBroker for docKey [" << _docKey << "] with reason: " << reason);
-    terminateChild(reason, true);
+    terminateChild(reason, false);
 }
 
 void DocumentBroker::updateLastActivityTime()


More information about the Libreoffice-commits mailing list