wsd/ClientSession.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bd7b2b833c064a64d830d1b032cb8c98e85cd2a9
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Fri Feb 2 13:08:25 2018 +0530
wsd: Don't request closing here, just stop the broker
Asking the doc broker to close means that it will save the current
document to storage before shutting down. But we don't want that because
storing the current document to storage means overwriting the document
which has been changed underneath us.
Change-Id: I8df45d2f0cf3f65936dc3030f483e52fd1703146
Reviewed-on: https://gerrit.libreoffice.org/49134
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 8d727247..d94a8467 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -190,7 +190,7 @@ bool ClientSession::_handleInput(const char *buffer, int
length)
LOG_DBG("Document marked as changed in storage and user ["
<< getUserId() << ", " << getUserName()
<< "] wants to refresh the document for all.");
- docBroker->closeDocument("documentconflict " + getUserName());
+ docBroker->stop("documentconflict " + getUserName());
}
return true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
