fix(audio): remove static string causing initialization order crash in addAudioEvent

bobtista · bobtista · commit c8831a0ea7fd · 2025-11-29T15:54:42.000-05:00
diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp
@@ -72,8 +72,6 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-static const AsciiString s_noSoundString("NoSound");
-
 static const char* TheSpeakerTypes[] =
 {
 	"2 Speakers",
@@ -409,7 +407,7 @@ void AudioManager::getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill
 //-------------------------------------------------------------------------------------------------
 AudioHandle AudioManager::addAudioEvent(const AudioEventRTS *eventToAdd)
 {
-	if (eventToAdd->getEventName().isEmpty() || eventToAdd->getEventName() == s_noSoundString) {
+	if (eventToAdd->getEventName().isEmpty() || eventToAdd->getEventName() == AsciiString("NoSound")) {
 		return AHSV_NoSound;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,6 @@`
`72`	`72`
`73`	`73`	`///////////////////////////////////////////////////////////////////////////////////////////////////`
`74`	`74`
`75`		`-static const AsciiString s_noSoundString("NoSound");`
`76`		`-`
`77`	`75`	`static const char* TheSpeakerTypes[] =`
`78`	`76`	`{`
`79`	`77`	`"2 Speakers",`
`@@ -409,7 +407,7 @@ void AudioManager::getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill`
`409`	`407`	`//-------------------------------------------------------------------------------------------------`
`410`	`408`	`AudioHandle AudioManager::addAudioEvent(const AudioEventRTS *eventToAdd)`
`411`	`409`	`{`
`412`		`- if (eventToAdd->getEventName().isEmpty() \|\| eventToAdd->getEventName() == s_noSoundString) {`
	`410`	`+ if (eventToAdd->getEventName().isEmpty() \|\| eventToAdd->getEventName() == AsciiString("NoSound")) {`
`413`	`411`	`return AHSV_NoSound;`
`414`	`412`	`}`
`415`	`413`