[Libreoffice-commits] online.git: loolwsd/ClientSession.cpp

Tor Lillqvist tml at collabora.com
Wed Aug 31 14:55:03 UTC 2016


 loolwsd/ClientSession.cpp |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b7623d48d03f9e6256c71612e480d3df57be4cd5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 31 17:52:10 2016 +0300

    We should return true here
    
    Fixes a regression introduced in
    571ff06906960c9840cd65a35914ca0607f72a11, where every loleaflet client
    ran into an error, displayed as "We are sorry, this is an unexpected
    connection error. Please try again."
    
    Found by git bisecting.

diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index 71746dd..40deeee 100644
--- a/loolwsd/ClientSession.cpp
+++ b/loolwsd/ClientSession.cpp
@@ -148,6 +148,7 @@ bool ClientSession::_handleInput(const char *buffer, int length)
     else if (tokens[0] == "canceltiles")
     {
         _docBroker->cancelTileRequests(shared_from_this());
+        return true;
     }
     else if (tokens[0] == "commandvalues")
     {


More information about the Libreoffice-commits mailing list