pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix audio deadlock

Browse source 
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 7a98ee6c96
commit 0b40668408
1 changed files with 4 additions and 3 deletions
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);