strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Process any pending tileQueue items first.

Browse source 
Change-Id: I078bc1f52ba7647ca1715ea3222d695936dd657f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98928
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Michael Meeks 2020-07-16 19:10:05 +01:00
parent 95d683f6ab
commit 0084c3b275
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kit/Kit.cpp
View file

@ -1386,11 +1386,16 @@ private:
}
public:
bool hasQueueItems() const
{
return _tileQueue && !_tileQueue->isEmpty();
}
void drainQueue(const std::chrono::steady_clock::time_point &/*now*/)
{
try
{
while (!_tileQueue->isEmpty())
while (hasQueueItems())
{
if (_stop || SigUtil::getTerminationFlag())
{
@ -1679,7 +1684,10 @@ public:
_pollEnd = std::chrono::steady_clock::now() + std::chrono::microseconds(timeoutMicroS);
do
{
if (poll(timeoutMicroS) <= 0)
int realTimeout = timeoutMicroS;
if (_document && _document->hasQueueItems())
realTimeout = 0;
if (poll(realTimeout) <= 0)
break;
const auto now = std::chrono::steady_clock::now();