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

[Jan Holesovsky]

 wsd/DocumentBroker.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit daa061dbd67af32d2af6a59f2173b5eda4e5c970
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Nov 7 13:12:23 2017 +0100

    Save: Inform the user when saving has failed in LOK.
    
    Change-Id: Ie3bcdf9f6ca898b2763c31e6eb05c3a20be5859f
    Reviewed-on: https://gerrit.libreoffice.org/44399
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index a6a91c1a..0d5e7342 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -630,6 +630,14 @@ bool DocumentBroker::saveToStorageInternal(const std::string& sessionId,
         return false;
     }
 
+    // Check that we are actually about to upload a successfully saved document.
+    if (!success)
+    {
+        LOG_ERR("Cannot save docKey [" << _docKey << "], the .uno:Save has failed in LOK.");
+        it->second->sendTextFrame("error: cmd=storage kind=savefailed");
+        return false;
+    }
+
     const Authorization auth = it->second->getAuthorization();
     const auto uri = isSaveAs? saveAsPath: it->second->getPublicUri().toString();