zinface
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix audio deadlock 

James Zipperer

Close the audio device before waiting for the audio thread to complete, which fixes a situation where the audio thread never completes

Add an additional check in the audio thread to see if the device is enabled and bail out if the device is no longer enabled
This commit is contained in:
Sam Lantinga 2016-10-04 06:45:28 -07:00
parent 56c88c4531
commit 2558c9c836
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/audio/SDL_audio.c
View File

@ -1051,6 +1051,10 @@ close_audio_device(SDL_AudioDevice * device)
{
SDL_AtomicSet(&device->shutdown, 1);
SDL_AtomicSet(&device->enabled, 0);
if (device->hidden != NULL) {
current_audio.impl.CloseDevice(device);
}
if (device->thread != NULL) {
SDL_WaitThread(device->thread, NULL);
}
@ -1061,9 +1065,6 @@ close_audio_device(SDL_AudioDevice * device)
if (device->convert.needed) {
SDL_free(device->convert.buf);
}
if (device->hidden != NULL) {
current_audio.impl.CloseDevice(device);
}
free_audio_queue(device->buffer_queue_head);
free_audio_queue(device->buffer_queue_pool);