From e7f0c1e79ea9c8f695b2d779cd4da9801ca5f542 Mon Sep 17 00:00:00 2001 From: Eidolon Date: Thu, 30 Jan 2025 17:00:03 -0600 Subject: [PATCH] Clear audio graph on I_ShutdownSound Fixes a crash when destroying SDL AudioStreams under SDL3 and SDL2-compat. --- src/sdl/new_sound.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/sdl/new_sound.cpp b/src/sdl/new_sound.cpp index 8ec0f604d..a4549745b 100644 --- a/src/sdl/new_sound.cpp +++ b/src/sdl/new_sound.cpp @@ -385,6 +385,20 @@ void I_ShutdownSound(void) g_input_device_id = 0; } + master_gain = nullptr; + master = nullptr; + mixer_sound_effects = nullptr; + mixer_music = nullptr; + mixer_voice = nullptr; + music_player = nullptr; + resample_music_player = nullptr; + gain_sound_effects = nullptr; + gain_music_player = nullptr; + gain_music_channel = nullptr; + gain_voice_channel = nullptr; + sound_effect_channels.clear(); + player_voice_channels.clear(); + SDL_QuitSubSystem(SDL_INIT_AUDIO); sound_started = false;