Skip to content
Snippets Groups Projects
Commit 3f89c98d authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-17816 Crash trying to schedule audio decoding on shutdown

parent 25900c17
No related branches found
No related tags found
1 merge request!83Merge Linden 6.6.7
...@@ -607,6 +607,8 @@ void LLAudioDecodeMgr::Impl::startMoreDecodes() ...@@ -607,6 +607,8 @@ void LLAudioDecodeMgr::Impl::startMoreDecodes()
// Kick off a decode // Kick off a decode
mDecodes[decode_id] = LLPointer<LLVorbisDecodeState>(NULL); mDecodes[decode_id] = LLPointer<LLVorbisDecodeState>(NULL);
try
{
main_queue->postTo( main_queue->postTo(
general_queue, general_queue,
[decode_id]() // Work done on general queue [decode_id]() // Work done on general queue
...@@ -638,6 +640,14 @@ void LLAudioDecodeMgr::Impl::startMoreDecodes() ...@@ -638,6 +640,14 @@ void LLAudioDecodeMgr::Impl::startMoreDecodes()
enqueueFinishAudio(decode_id, decode_state); enqueueFinishAudio(decode_id, decode_state);
}); });
} }
catch (const LLThreadSafeQueueInterrupt&)
{
// Shutdown
// Consider making processQueue() do a cleanup instead
// of starting more decodes
LL_WARNS() << "Tried to start decoding on shutdown" << LL_ENDL;
}
}
} }
LLPointer<LLVorbisDecodeState> beginDecodingAndWritingAudio(const LLUUID &decode_id) LLPointer<LLVorbisDecodeState> beginDecodingAndWritingAudio(const LLUUID &decode_id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment