summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <none@none>2013-05-06 15:01:13 -0700
committercallum_linden <none@none>2013-05-06 15:01:13 -0700
commit9707f09fd8c4e173edf453ec622e60a9b6d9e0e3 (patch)
tree2aa48b34a00efa286443a5eb13abff7581177bfa /indra
parent06f5872741d2ba5e5197ba7861c946b18ccf27ab (diff)
MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown()
Diffstat (limited to 'indra')
-rw-r--r--indra/llaudio/llaudioengine_fmodex.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 5ec30c7d1d..fe6dedcd03 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -305,8 +305,11 @@ void LLAudioEngine_FMODEX::shutdown()
LLAudioEngine::shutdown();
llinfos << "LLAudioEngine_FMODEX::shutdown() closing FMOD Ex" << llendl;
- mSystem->close();
- mSystem->release();
+ if ( mSystem ) // speculative fix for MAINT-2657
+ {
+ mSystem->close();
+ mSystem->release();
+ }
llinfos << "LLAudioEngine_FMODEX::shutdown() done closing FMOD Ex" << llendl;
delete mListenerp;