[Libreoffice-commits] online.git: Branch 'private/Ashod/tileprioritization' - loolwsd/MessageQueue.cpp

[Ashod Nakashian]

 loolwsd/MessageQueue.cpp |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit b2a1f06ed084030307b737a3c05facd66e86bb9c
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Wed Sep 14 18:18:08 2016 -0400

    loolwsd: only prioritize tile messages and not tilecombine
    
    Change-Id: Ia292e5b499dd4409dc3a672e4d5360c868d6c71f

diff --git a/loolwsd/MessageQueue.cpp b/loolwsd/MessageQueue.cpp
index 756e568..0660d2b 100644
--- a/loolwsd/MessageQueue.cpp
+++ b/loolwsd/MessageQueue.cpp
@@ -158,6 +158,11 @@ void TileQueue::reprioritize(const CursorPosition& cursorPosition)
     {
         auto& it = _queue[i];
         const std::string msg(it.data(), it.size());
+        if (msg.compare(0, 5, "tile ") != 0)
+        {
+            continue;
+        }
+
         auto tile = TileDesc::parse(msg); //FIXME: Expensive, avoid.
 
         if (tile.intersectsWithRect(cursorPosition.X, cursorPosition.Y, cursorPosition.Width, cursorPosition.Height))
@@ -178,6 +183,11 @@ void TileQueue::reprioritize(const CursorPosition& cursorPosition)
 
 bool TileQueue::priority(const std::string& tileMsg)
 {
+    if (tileMsg.compare(0, 5, "tile ") != 0)
+    {
+        return false;
+    }
+
     auto tile = TileDesc::parse(tileMsg); //FIXME: Expensive, avoid.
 
     for (auto& pair : _cursorPositions)