diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-03-14 06:39:09 +0200 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-03-14 06:39:09 +0200 |
| commit | 36c8c92098004c4f2eb80114a49f3660a2d3dcbb (patch) | |
| tree | 3af97aed70b19412cd5f67ca20620e597aafb892 /indra/newview/llstartup.cpp | |
| parent | c7aad1f7e3f643706d714b4426070174abc95145 (diff) | |
MAINT-3804 FIXED Crash in LLAudioEngine::getAudioData when playing gestures with audio device disabled.
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index d5f8a1e46e..635776713d 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -624,25 +624,22 @@ bool idle_startup() if (FALSE == gSavedSettings.getBOOL("NoAudio")) { + delete gAudiop; gAudiop = NULL; #ifdef LL_FMODEX - if (!gAudiop #if !LL_WINDOWS - && NULL == getenv("LL_BAD_FMODEX_DRIVER") + if (NULL == getenv("LL_BAD_FMODEX_DRIVER") #endif // !LL_WINDOWS - ) { gAudiop = (LLAudioEngine *) new LLAudioEngine_FMODEX(gSavedSettings.getBOOL("FMODExProfilerEnable")); } #endif #ifdef LL_OPENAL - if (!gAudiop #if !LL_WINDOWS - && NULL == getenv("LL_BAD_OPENAL_DRIVER") + if (NULL == getenv("LL_BAD_OPENAL_DRIVER") #endif // !LL_WINDOWS - ) { gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL(); } |