Skip to content

Commit 38a4202

Browse files
authored
bugfix(gui): Fix crash when RenderFpsFontSize is set to 0 (#1788)
1 parent d453a21 commit 38a4202

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5759,7 +5759,6 @@ void InGameUI::refreshRenderFpsResources(void)
57595759
m_renderFpsString = TheDisplayStringManager->newDisplayString();
57605760
m_lastRenderFps = ~0u;
57615761
m_lastRenderFpsUpdateMs = 0u;
5762-
updateRenderFpsString();
57635762
}
57645763

57655764
if (!m_renderFpsLimitString)
@@ -5773,6 +5772,11 @@ void InGameUI::refreshRenderFpsResources(void)
57735772
GameFont *fpsFont = TheWindowManager->winFindFont(m_renderFpsFont, adjustedRenderFpsFontSize, m_renderFpsBold);
57745773
m_renderFpsString->setFont(fpsFont);
57755774
m_renderFpsLimitString->setFont(fpsFont);
5775+
5776+
if (m_renderFpsPointSize > 0)
5777+
{
5778+
updateRenderFpsString();
5779+
}
57765780
}
57775781

57785782
void InGameUI::refreshSystemTimeResources(void)

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5932,7 +5932,6 @@ void InGameUI::refreshRenderFpsResources(void)
59325932
m_renderFpsString = TheDisplayStringManager->newDisplayString();
59335933
m_lastRenderFps = ~0u;
59345934
m_lastRenderFpsUpdateMs = 0u;
5935-
updateRenderFpsString();
59365935
}
59375936

59385937
if (!m_renderFpsLimitString)
@@ -5946,6 +5945,11 @@ void InGameUI::refreshRenderFpsResources(void)
59465945
GameFont *fpsFont = TheWindowManager->winFindFont(m_renderFpsFont, adjustedRenderFpsFontSize, m_renderFpsBold);
59475946
m_renderFpsString->setFont(fpsFont);
59485947
m_renderFpsLimitString->setFont(fpsFont);
5948+
5949+
if (m_renderFpsPointSize > 0)
5950+
{
5951+
updateRenderFpsString();
5952+
}
59495953
}
59505954

59515955
void InGameUI::refreshSystemTimeResources(void)

0 commit comments

Comments
 (0)