thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sdl/new_sound.cpp
View file

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