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

Miklos Vajna vmiklos at collabora.co.uk
Wed Oct 28 09:31:29 PDT 2015


 loolwsd/LOOLWSD.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1409ef11ec0f27f4c7035c94ec710a253861d1a9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Oct 28 17:29:45 2015 +0100

    loolwsd: allow duplicate messages for all message types expect tile
    
    To be on the safe side, I only allowed "uno" previously, but Mihai
    confirmed that the intention was to filter out "tile" duplicates, so
    filter out only that.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ffea9ea..3ca5c6f 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -403,8 +403,8 @@ public:
                                 // Also forward the "canceltiles" to the child process, if any
                                 session->handleInput(buffer, n);
                             }
-                            // Filtering out duplicated uno commands would change the meaning of the message sequence.
-                            else if (!queue.alreadyInQueue(firstLine) || firstLine.find("uno") == 0)
+                            // Filter out duplicated tile messages.
+                            else if (firstLine.find("tile") != 0 || !queue.alreadyInQueue(firstLine))
                             {
                                 queue.put(firstLine);
                             }


More information about the Libreoffice-commits mailing list