Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 16:43:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7479 from sethalves/fix-logging-crash

Browse source 
fix locking in GenericQueueThread::process
This commit is contained in:
Brad Hefta-Gaub 2016-03-25 17:56:10 -07:00
commit bb42d84bbd
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/shared/src/GenericQueueThread.h
View file

@ -45,18 +45,23 @@ protected:
} }
virtual bool process() { virtual bool process() {
lock();
if (!_items.size()) { if (!_items.size()) {
unlock();
_hasItemsMutex.lock(); _hasItemsMutex.lock();
_hasItems.wait(&_hasItemsMutex, getMaxWait()); _hasItems.wait(&_hasItemsMutex, getMaxWait());
_hasItemsMutex.unlock(); _hasItemsMutex.unlock();
} else {
unlock();
} }
lock();
if (!_items.size()) { if (!_items.size()) {
unlock();
return isStillRunning(); return isStillRunning();
} }
Queue processItems; Queue processItems;
lock();
processItems.swap(_items); processItems.swap(_items);
unlock(); unlock();
return processQueueItems(processItems); return processQueueItems(processItems);