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,7 +186,8 @@ void I_ShutdownSound(void) {
SdlAudioLockHandle _;
for (auto& channel : sound_effect_channels) {
*channel = audio::SoundEffectPlayer();
if (channel)
*channel = audio::SoundEffectPlayer();
}
}
@ -329,7 +330,8 @@ void I_InitMusic(void) {
void I_ShutdownMusic(void) {
SdlAudioLockHandle _;
*music_player = audio::MusicPlayer();
if (music_player)
*music_player = audio::MusicPlayer();
}
/// ------------------------