audio: fix crash on looped stream shutdown

LostArtefacts · May 5, 2024 · e5b5d53 · e5b5d53
1 parent 945ba57
commit e5b5d53
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/engine/audio.c b/src/engine/audio.c
@@ -78,16 +78,16 @@ bool Audio_Shutdown(void)
         return false;
     }
 
-    Audio_Sample_Shutdown();
-    Audio_Stream_Shutdown();
-
     if (g_AudioDeviceID) {
         SDL_PauseAudioDevice(g_AudioDeviceID, 1);
         SDL_CloseAudioDevice(g_AudioDeviceID);
         g_AudioDeviceID = 0;
     }
 
     Memory_FreePointer(&m_MixBuffer);
+
+    Audio_Sample_Shutdown();
+    Audio_Stream_Shutdown();
     return true;
 }
 

diff --git a/src/engine/audio_stream.c b/src/engine/audio_stream.c
@@ -441,6 +441,10 @@ bool Audio_Stream_Unpause(int32_t sound_id)
 
 int32_t Audio_Stream_CreateFromFile(const char *file_path)
 {
+    if (!g_AudioDeviceID) {
+        return AUDIO_NO_SOUND;
+    }
+
     assert(file_path != NULL);
 
     for (int32_t sound_id = 0; sound_id < AUDIO_MAX_ACTIVE_STREAMS;