diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-09 11:15:01 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-09 11:15:01 -0800 |
| commit | 73b6d4d058107137425cd202e79fb0a2d9c22896 (patch) | |
| tree | 206656e6ac90aff254cfb7532f0d1910a39dff85 /indra | |
| parent | 2b6cf1d79929c1fb9b62f52f80bd72a949a4d11e (diff) | |
Fix crash if thread is manually shut down before it is destroyed.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index d7b7c3699c..2408be74b9 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -153,10 +153,12 @@ void LLThread::shutdown() } delete mRunCondition; + mRunCondition = 0; - if (mIsLocalPool) + if (mIsLocalPool && mAPRPoolp) { apr_pool_destroy(mAPRPoolp); + mAPRPoolp = 0; } } |