[Libreoffice-commits] online.git: wsd/ClientSession.cpp

Jan Holesovsky kendy at collabora.com
Wed Jun 7 14:36:14 UTC 2017


 wsd/ClientSession.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ca39f61330c0e30740bd6743884cf365074478e7
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Jun 7 16:32:58 2017 +0200

    Don't crash on Shift+reload.
    
    Change-Id: I1706fc0ff748fa74f2d2b29f103c167acf36c706
    Reviewed-on: https://gerrit.libreoffice.org/38516
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 125b24ee..5cdcaaf3 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -561,7 +561,10 @@ bool ClientSession::handleKitToClientMessage(const char* buffer, const int lengt
                 // Save to Storage and log result.
                 std::string id = getId();
                 docBroker->saveToStorage(id, success, result);
-                forwardToClient(payload);
+
+                if (!isCloseFrame())
+                    forwardToClient(payload);
+
                 return true;
             }
         }


More information about the Libreoffice-commits mailing list