mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
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:
commit
bdbcceb212
1 changed files with 4 additions and 2 deletions
|
|
@ -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();
|
||||
}
|
||||
|
||||
/// ------------------------
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue