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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Sun Mar 26 05:12:52 UTC 2017


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

New commits:
commit 5eed6575df0133ed38a6a47509d6b96c771e2b3c
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Mar 26 00:52:34 2017 -0400

    wsd: don't pretent there was a recent save on creating DocBroker
    
    Now the poll thread can exit immediately when loading
    fails, since we don't think there is an active
    saving on going.
    
    Change-Id: I602b2b506f92309d34ec697553bac05523d70e20
    Reviewed-on: https://gerrit.libreoffice.org/35714
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index fe0372e7..ba3a7595 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -143,7 +143,7 @@ DocumentBroker::DocumentBroker(const std::string& uri,
     _childRoot(childRoot),
     _cacheRoot(getCachePath(uriPublic.toString())),
     _lastSaveTime(std::chrono::steady_clock::now()),
-    _lastSaveRequestTime(std::chrono::steady_clock::now()),
+    _lastSaveRequestTime(std::chrono::steady_clock::now() - std::chrono::milliseconds(COMMAND_TIMEOUT_MS)),
     _markToDestroy(false),
     _lastEditableSession(false),
     _isLoaded(false),


More information about the Libreoffice-commits mailing list