TheSuperHackers
diff --git a/‎Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp‎
Lines changed: 1 addition & 3 deletions b/‎Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp‎
Lines changed: 1 addition & 3 deletions b/‎GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp‎
Lines changed: 1 addition & 3 deletions
@@ -306,9 +306,7 @@ void W3DDisplayString::setFont( GameFont *font )
 	// set the font in our renderer
 	m_textRenderer.Set_Font( static_cast<FontCharsClass *>(m_font->fontData) );
 
-	// TheSuperHackers @fix bobtista 19/07/2026 Guard against null bold font to prevent crash when font loading fails
-	GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE );
-	if( boldFont != nullptr )
+	if( GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE ) )
 	{
 		m_textRendererHotKey.Set_Font( static_cast<FontCharsClass *>(boldFont->fontData) );
 	}
 
@@ -306,9 +306,7 @@ void W3DDisplayString::setFont( GameFont *font )
 	// set the font in our renderer
 	m_textRenderer.Set_Font( static_cast<FontCharsClass *>(m_font->fontData) );
 
-	// TheSuperHackers @fix bobtista 19/07/2026 Guard against null bold font to prevent crash when font loading fails
-	GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE );
-	if( boldFont != nullptr )
+	if( GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE ) )
 	{
 		m_textRendererHotKey.Set_Font( static_cast<FontCharsClass *>(boldFont->fontData) );
 	}
Original file line number	Diff line number	Diff line change
`@@ -306,9 +306,7 @@ void W3DDisplayString::setFont( GameFont *font )`
`306`	`306`	`// set the font in our renderer`
`307`	`307`	`m_textRenderer.Set_Font( static_cast<FontCharsClass *>(m_font->fontData) );`
`308`	`308`
`309`		`- // TheSuperHackers @fix bobtista 19/07/2026 Guard against null bold font to prevent crash when font loading fails`
`310`		`- GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE );`
`311`		`- if( boldFont != nullptr )`
	`309`	`+ if( GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE ) )`
`312`	`310`	`{`
`313`	`311`	`m_textRendererHotKey.Set_Font( static_cast<FontCharsClass *>(boldFont->fontData) );`
`314`	`312`	`}`