loolwsd/MessageQueue.cpp | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 4b0ebe49488b44eb6b4d6997dad70f0ccf0c471e
Author: Michael Meeks <michael.me...@collabora.com>
Date: Tue Nov 1 22:40:11 2016 +0000
Slide thumbnailing / canceltiles fix.
Avoid canceltiles on in-flight message queue in loolkit potentially
overlooked in 97adaf935b3
diff --git a/loolwsd/MessageQueue.cpp b/loolwsd/MessageQueue.cpp
index 3729018..9a34187 100644
--- a/loolwsd/MessageQueue.cpp
+++ b/loolwsd/MessageQueue.cpp
@@ -102,6 +102,9 @@ void TileQueue::put_impl(const Payload& value)
[&tokens](const Payload& v)
{
const std::string s(v.data(), v.size());
+ // Tile is for a thumbnail, don't cancel it
+ if (s.find("id=") != std::string::npos)
+ return false;
for (size_t i = 0; i < tokens.count(); ++i)
{
if (s.find("ver=" + tokens[i]) != std::string::npos)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
