commit 2e481560726e7c34a425ec6dcfcbe791a2e1fe38
author Sam Lantinga <slouken@libsdl.org> Tue Oct 04 06:45:28 2016 -0700
committer Sam Lantinga <slouken@libsdl.org> Tue Oct 04 06:45:28 2016 -0700
tree cb70e8bd84a74c6962548a5777a4710bc454410f
parent a90edd90a8f41a86c8cce45fa98147b28c1c2697

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

src/audio/SDL_audio.c

diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 632731b..29b08e7 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -1051,6 +1051,10 @@
 {
     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 @@
     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);