Browse Source

Backed out a very unsafe change that was trying to prevent audio hang at quit.

Ryan and I have ideas on a better way to handle this.
Sam Lantinga 8 years ago
parent
commit
9257b72d53
1 changed files with 3 additions and 4 deletions
  1. 3 4
      src/audio/SDL_audio.c

+ 3 - 4
src/audio/SDL_audio.c

@@ -1066,10 +1066,6 @@ 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);
     }
@@ -1080,6 +1076,9 @@ 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);