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

[Jan Holesovsky]

 loolwsd/LOOLSession.cpp |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 0f03c3b925f35d9ed762effa80a2ddb0d444b9e1
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Nov 9 22:20:26 2015 +0100

    loolwsd: Don't assert on 'canceltiles'.
    
    Fixes a regression from 6a1477d8a9ba70e01bfe494f5850ba7eae8ee8c1 where now the
    'canceltiles' command reaches the ChildProcessSession::handleInput().
    
    This is good in general - in case'd need to add some special handling even to
    the handler; but so far all we need happens on the message queue level.

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 883ebce..7565470 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -699,15 +699,21 @@ bool ChildProcessSession::handleInput(const char *buffer, int length)
 
     Application::instance().logger().information(Util::logPrefix() + _kindString + ",Input," + getAbbreviatedMessage(buffer, length));
 
-    if (tokens[0] == "commandvalues")
+    if (tokens[0] == "canceltiles")
+    {
+        // this command makes sense only on the command queue level, nothing
+        // to do here
+        return true;
+    }
+    else if (tokens[0] == "commandvalues")
     {
         return getCommandValues(buffer, length, tokens);
     }
-    if (tokens[0] == "partpagerectangles")
+    else if (tokens[0] == "partpagerectangles")
     {
         return getPartPageRectangles(buffer, length);
     }
-    if (tokens[0] == "load")
+    else if (tokens[0] == "load")
     {
         if (_docURL != "")
         {