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

[Ashod Nakashian]

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

New commits:
commit d96cb94d023ac31459c64f60dd659f37d3239bdb
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Thu Jan 4 00:16:40 2018 -0500

    wsd: set modified flag on the storage when set on the DocumentBroker
    
    Reviewed-on: https://gerrit.libreoffice.org/47367
    Reviewed-by: Jan Holesovsky <ke...@collabora.com>
    Tested-by: Jan Holesovsky <ke...@collabora.com>
    (cherry picked from commit 752e3b7002f2199438aa81d5b660088da3faac44)
    
    Change-Id: I13e25b2edff33d6fd9999dec5eb34d7847fbbd2e
    Reviewed-on: https://gerrit.libreoffice.org/47400
    Reviewed-by: Jan Holesovsky <ke...@collabora.com>
    Tested-by: Jan Holesovsky <ke...@collabora.com>
    (cherry picked from commit e9ce36f26ea3f007e00efbf9012bbbe8f93ccc9d)

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index e74c22f5..53e0ae61 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -416,7 +416,6 @@ bool DocumentBroker::load(const 
std::shared_ptr<ClientSession>& session, const s
             LOG_ERR("Failed to create Storage instance for [" << _docKey << "] 
in " << jailPath.toString());
             return false;
         }
-
         firstInstance = true;
     }
 
@@ -926,7 +925,6 @@ bool DocumentBroker::sendUnoSave(const std::string& 
sessionId, bool dontTerminat
         oss << "}";
 
         assert(_storage);
-        _storage->setUserModified(_isModified);
         _storage->setIsAutosave(isAutosave || UnitWSD::get().isAutosave());
 
         const auto saveArgs = oss.str();
@@ -1409,6 +1407,7 @@ void DocumentBroker::setModified(const bool value)
         Admin::instance().modificationAlert(_docKey, getPid(), value);
     }
 
+    _storage->setUserModified(value);
     _tileCache->setUnsavedChanges(value);
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits