[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Aug 20 16:20:12 UTC 2018


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

New commits:
commit fd87e1e315fad5c3017f79f832d639bc5ea9dc29
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Aug 20 18:07:16 2018 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Mon Aug 20 18:19:54 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>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 2bd5b5d02..cfd288507 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1385,7 +1385,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());
 


More information about the Libreoffice-commits mailing list