always skip fmod shutdown, instead of just for release builds.
fmod shutdown has been a source of mystery crashes forEVER (go mine svn!). I don't know why they'd be more aggressive now. butttt... materially different code behaviour depending on build type sucks as a policy anyway, so always skip fmod shutdown. straight-to-trunk to unblock(?) featurettes landing.meow-7.2.2
parent
14a5879c88
commit
9c0dbb1233
|
|
@ -1168,17 +1168,15 @@ bool LLAppViewer::cleanup()
|
|||
|
||||
if (gAudiop)
|
||||
{
|
||||
#if LL_RELEASE_FOR_DOWNLOAD
|
||||
bool want_longname = false;
|
||||
if (gAudiop->getDriverName(want_longname) == "FMOD")
|
||||
{
|
||||
// This hack exists because fmod likes to occasionally
|
||||
// hang forever when shutting down, for no apparent
|
||||
// reason.
|
||||
// crash or hang forever when shutting down, for no
|
||||
// apparent reason.
|
||||
llwarns << "Hack, skipping FMOD audio engine cleanup" << llendflush;
|
||||
}
|
||||
else
|
||||
#endif // LL_RELEASE_FOR_DOWNLOAD
|
||||
{
|
||||
gAudiop->shutdown();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue