[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - 2 commits - discovery.xml wsd/ClientSession.cpp

[Jan Holesovsky]

 discovery.xml         |    3 +++
 wsd/ClientSession.cpp |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ba29607b55825e2a69314056a8b8b9878eb6cd82
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Jun 14 13:54:51 2017 +0200

    discovery: Add bmp as read-only type too.
    
    Change-Id: I42f21bab6f8d4ba24580f6d6e4a3a1dd5cd57811
    Reviewed-on: https://gerrit.libreoffice.org/38782
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit ca1b3e7ec7d3c806edc36396a5de8e5d49c01467)
    Reviewed-on: https://gerrit.libreoffice.org/48673
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/discovery.xml b/discovery.xml
index 6172496d..0a9ca48c 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -318,6 +318,9 @@
         <app name="application/vnd.sun.xml.report.chart">
             <action name="edit" ext="odc"/>
         </app>
+        <app name="image/bmp">
+            <action name="view" ext="bmp"/>
+        </app>
         <app name="image/png">
             <action name="view" ext="png"/>
         </app>
commit 418002956e8685f09af7b71fa912fc80ef42fc04
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>
    (cherry picked from commit ca39f61330c0e30740bd6743884cf365074478e7)
    Reviewed-on: https://gerrit.libreoffice.org/48672
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

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