[Libreoffice-commits] online.git: kit/Kit.cpp

[Libreoffice Gerrit user]

 kit/Kit.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit adbcc28273da6511050ca37c3d5ee4c93ac3ba7f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Nov 7 13:21:25 2018 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Nov 7 14:19:02 2018 +0100

    If we skipped all tiles, don't bother sending an empty tilecombine: message
    
    It would just be ignored later anyway, and produce the warning "WRN
    Dropping empty tilecombine response".
    
    Change-Id: I6d92367262dc306369f2ca6c2e1964b5d151acc1
    Reviewed-on: https://gerrit.libreoffice.org/63013
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index c78f73c3b..8eda6ce10 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1179,6 +1179,12 @@ public:
                 renderArea.getWidth() << ", " << renderArea.getHeight() << ") " <<
                 " took " << (elapsed/1000.) << " ms (including the paintTile).");
 
+        if (tileIndex == 0)
+        {
+            LOG_DBG("All tiles skipped, not producing empty tilecombine: message");
+            return;
+        }
+
         const auto tileMsg = ADD_DEBUG_RENDERID(tileCombined.serialize("tilecombine:")) + "\n";
         LOG_TRC("Sending back painted tiles for " << tileMsg);