- fixed crash when exiting before sound engine initialization

https://forum.zdoom.org/viewtopic.php?t=66605
ZDoom · Dec 9, 2019 · 430a6f3 · 430a6f3
1 parent 47305a7
commit 430a6f3
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/sound/s_advsound.cpp b/src/sound/s_advsound.cpp
@@ -741,18 +741,21 @@ void FPlayerSoundHashTable::MarkUsed()
 
 void S_ClearSoundData()
 {
-	soundEngine->StopAllChannels();
-	soundEngine->UnloadAllSounds();
-	auto &S_sfx = soundEngine->GetSounds();
-	S_sfx.Clear();
+	if (soundEngine)
+	{
+		soundEngine->StopAllChannels();
+		soundEngine->UnloadAllSounds();
+		soundEngine->GetSounds().Clear();
+		soundEngine->ClearRandoms();
+	}
+
 	Ambients.Clear();
 	while (MusicVolumes != NULL)
 	{
 		FMusicVolume *me = MusicVolumes;
 		MusicVolumes = me->Next;
 		M_Free(me);
 	}
-	soundEngine->ClearRandoms();
 
 	NumPlayerReserves = 0;
 	PlayerClassesIsSorted = false;