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

[Ashod Nakashian]

 loolwsd/LOOLKit.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7fff96039118e29ebc125f65b94560332cd41355
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Sep 19 00:20:02 2016 -0400

    loolwsd: stop the tile-queue when exiting
    
    Change-Id: I49276c9639e8826d145a31eb476b41eb64baf88a
    Reviewed-on: https://gerrit.libreoffice.org/29009
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 74ef66b..29d84f4 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -426,6 +426,9 @@ public:
         _callbackQueue.wakeUpAll();
         _callbackThread.join();
 
+        _tileQueue->put("eof");
+        _tilesThread.join();
+
         // Flag all connections to stop.
         for (auto aIterator : _connections)
         {
@@ -1218,7 +1221,7 @@ private:
 
         try
         {
-            while (true)
+            while (!pThis->_stop)
             {
                 const auto input = pThis->_tileQueue->get();
                 const std::string message(input.data(), input.size());