-Blood: fix crashes when trying to exit from a fatal error during sta…

…rtup. soundEngine can be null here.
ZDoom · Feb 20, 2022 · b6eadbc · b6eadbc
1 parent 7897945
commit b6eadbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/source/games/blood/src/sfx.cpp b/source/games/blood/src/sfx.cpp
@@ -265,7 +265,7 @@ void sfxKill3DSound(DBloodActor* pActor, int a2, int a3)
 
 void sfxKillAllSounds(void)
 {
-	soundEngine->EnumerateChannels([](FSoundChan* channel)
+	if (soundEngine) soundEngine->EnumerateChannels([](FSoundChan* channel)
 		{
 			if (channel->SourceType == SOURCE_Actor || channel->SourceType == SOURCE_Unattached) soundEngine->StopChannel(channel);
 			return false;

diff --git a/source/games/blood/src/sound.cpp b/source/games/blood/src/sound.cpp
@@ -218,7 +218,7 @@ void sndStartWavDisk(const char* pzFile, int nVolume, int nChannel)
 
 void sndKillAllSounds(void)
 {
-	soundEngine->StopSound(CHAN_AUTO);
+	if (soundEngine) soundEngine->StopSound(CHAN_AUTO);
 }