[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - wsd/DocumentBroker.cpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a3fa44c0f373af8c434efc2d0d087932a5770a00
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Aug 20 18:07:16 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 20 18:20:25 2018 +0200

    Crash: Check whether we still have requested tiles
    
    Change-Id: I2a8b9ced09ff624ce925b52a60352e6fa50af25e
    Reviewed-on: https://gerrit.libreoffice.org/59334
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit fd87e1e315fad5c3017f79f832d639bc5ea9dc29)
    Reviewed-on: https://gerrit.libreoffice.org/59335
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 189db3ac3..eb0c1f522 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1408,7 +1408,8 @@ void DocumentBroker::sendRequestedTiles(const std::shared_ptr<ClientSession>& se
     if (!requestedTiles.empty())
     {
         std::vector<TileDesc> tilesNeedsRendering;
-        while(session->getTilesOnFlyCount() + session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit)
+        while(session->getTilesOnFlyCount() + session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit &&
+              !requestedTiles.empty())
         {
             TileDesc& tile = *(requestedTiles.begin());