From 35d3e6f28b5f6401746e345422f931bedcba02d8 Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 19:57:45 +0000
Subject: [PATCH] Add null check for system time string before drawing

---
 Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp   | 5 +++++
 GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
index 90ca9e950bd..ba7c4c066ea 100644
--- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -5971,6 +5971,11 @@ void InGameUI::drawRenderFps(Int &x, Int &y)
 
 void InGameUI::drawSystemTime(Int &x, Int &y)
 {
+	if (!m_systemTimeString)
+	{
+		return;
+	}
+
 	// current system time
 	SYSTEMTIME systemTime;
 	GetLocalTime( &systemTime );
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
index fa88a20afa6..edaeab22d88 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -6209,6 +6209,12 @@ void InGameUI::drawRenderFps(Int &x, Int &y)
 }
 
 void InGameUI::drawSystemTime(Int &x, Int &y)
+	if (!m_systemTimeString)
+	{
+		return;
+	}
+
+
 {
 	// current system time
 	SYSTEMTIME systemTime;
@@ -6345,4 +6351,6 @@ void InGameUI::drawGameTime()
 	m_gameTimeFrameString->draw(horizontalFrameOffset, m_gameTimePosition.y, GameMakeColor(180,180,180,255), m_gameTimeDropColor);
 }
 
+

+