[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/ClientSession.cpp

[Jan Holesovsky]

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

New commits:
commit a9d76cfd4cd36e89be1dad042ad1a95929b3f944
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/38515
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index ed15e8c1..7c22b04d 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -542,7 +542,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;
             }
         }