Merge branch 'fix-audio-null-deref' into 'master'

audio: conditionally shutdown SFX/Music players

See merge request KartKrew/Kart!881
This commit is contained in:
James R 2023-01-11 03:01:11 +00:00
commit bdbcceb212

View file

@ -186,6 +186,7 @@ void I_ShutdownSound(void) {
SdlAudioLockHandle _; SdlAudioLockHandle _;
for (auto& channel : sound_effect_channels) { for (auto& channel : sound_effect_channels) {
if (channel)
*channel = audio::SoundEffectPlayer(); *channel = audio::SoundEffectPlayer();
} }
} }
@ -329,6 +330,7 @@ void I_InitMusic(void) {
void I_ShutdownMusic(void) { void I_ShutdownMusic(void) {
SdlAudioLockHandle _; SdlAudioLockHandle _;
if (music_player)
*music_player = audio::MusicPlayer(); *music_player = audio::MusicPlayer();
} }