summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-12-10 16:15:18 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-12-10 16:15:18 -0800
commit56a39aa914fe32c1986202dc39a3ad4604943b39 (patch)
treef43af1773758fc4d285ee93f7de8dc94f182ac9b /indra/llcommon
parentdbcb6b4fa5a1838f64db4198aeca1894ec0008a8 (diff)
fix possible crash on shutdown in event queue flush.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llevents.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp
index b8a594b9bc..723cbd68c7 100644
--- a/indra/llcommon/llevents.cpp
+++ b/indra/llcommon/llevents.cpp
@@ -515,6 +515,8 @@ bool LLEventQueue::post(const LLSD& event)
void LLEventQueue::flush()
{
+ if(!mEnabled || !mSignal) return;
+
// Consider the case when a given listener on this LLEventQueue posts yet
// another event on the same queue. If we loop over mEventQueue directly,
// we'll end up processing all those events during the same flush() call