diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp index 1e2fb6dd814..eafcf5fe6d6 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp @@ -306,7 +306,10 @@ void W3DDisplayString::setFont( GameFont *font ) // set the font in our renderer m_textRenderer.Set_Font( static_cast(m_font->fontData) ); - m_textRendererHotKey.Set_Font( static_cast(TheFontLibrary->getFont(font->nameString,font->pointSize, TRUE)->fontData) ); + if( GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE ) ) + { + m_textRendererHotKey.Set_Font( static_cast(boldFont->fontData) ); + } // recompute extents for text with new font computeExtents(); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp index f8f5817d857..c8a4b78ea59 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp @@ -306,7 +306,10 @@ void W3DDisplayString::setFont( GameFont *font ) // set the font in our renderer m_textRenderer.Set_Font( static_cast(m_font->fontData) ); - m_textRendererHotKey.Set_Font( static_cast(TheFontLibrary->getFont(font->nameString,font->pointSize, TRUE)->fontData) ); + if( GameFont *boldFont = TheFontLibrary->getFont( font->nameString, font->pointSize, TRUE ) ) + { + m_textRendererHotKey.Set_Font( static_cast(boldFont->fontData) ); + } // recompute extents for text with new font computeExtents();