diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-19 16:01:20 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-19 16:01:20 +0100 |
| commit | 898dfdb52d24701bb2e51fd783c91721c0f5f40e (patch) | |
| tree | a16c783a4f49dd6be78aa3ac49782cbe0c9a3311 /indra/llcommon/llthreadsafequeue.h | |
| parent | 7e37263fc5cb93e31727b2e3243f2221ed1f8cad (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge remote-tracking branch 'origin/master' into SL-12995
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 |