diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 19:17:21 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 19:17:21 +0300 |
| commit | b3b33a03c41cf3e26c080adb9c6cbefb32c1c4de (patch) | |
| tree | 7c64d36bf256e59b09ee21306baaa3cb558d928b /indra/llcommon/llthreadsafequeue.h | |
| parent | 6d06d4bb5425c086551fa452fce3f9788fa16921 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/llcommon/llthreadsafequeue.h')
| -rw-r--r-- | indra/llcommon/llthreadsafequeue.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h index 30dd507f73..26e0d71d31 100644 --- a/indra/llcommon/llthreadsafequeue.h +++ b/indra/llcommon/llthreadsafequeue.h @@ -304,14 +304,13 @@ template<typename ElementT> bool LLThreadSafeQueue<ElementT>::isClosed() { lock_t lock(mLock); - return mClosed; + return mClosed && mStorage.size() == 0; } template<typename ElementT> LLThreadSafeQueue<ElementT>::operator bool() { - lock_t lock(mLock); - return ! mClosed; + return ! isClosed(); } #endif |