Skip to content

Fix observer overlay crash during surrender/replay #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
x64-dev merged 2 commits into from
Jan 31, 2026
Merged

Fix observer overlay crash during surrender/replay #311

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c099b91
Fix observer overlay crash during surrender/replay
MrS-ibra Jan 31, 2026
eaf8063
Merge branch 'main' into fix/observer-overlay-crash
x64-dev Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6009,6 +6009,15 @@ void InGameUI::drawObserverStats(Int& x, Int& y)
Real scale = (Real)screenW / 1920.0f;
scale = (scale < 0.7f) ? 0.7f : (scale > 2.0f) ? 2.0f : scale;

auto freeDisplayStrings = [](std::vector<DisplayString*>& strings) {
for (DisplayString* ds : strings) {
if (ds) {
TheDisplayStringManager->freeDisplayString(ds);
}
}
strings.clear();
};

static const Int numCols = 8;
static const wchar_t* headers[numCols] = {
L"(T) Name", L"Army", L"Cash", L"Cash/m", L"(R) XP", L"SP", L"K/D", L"Power"
Expand All @@ -6023,6 +6032,10 @@ void InGameUI::drawObserverStats(Int& x, Int& y)
static Int totalWidth = 0;
static Int totalHeight = 0;

static bool isUpdating = false;
if (isUpdating)
return;

UnsignedInt currentFrame = TheGameLogic ? TheGameLogic->getFrame() : 0;
Bool needUpdate = (lastUpdateFrame == 0) ||
(currentFrame - lastUpdateFrame >= LOGICFRAMES_PER_SECOND) ||
Expand All @@ -6032,6 +6045,7 @@ void InGameUI::drawObserverStats(Int& x, Int& y)
// UPDATE: gather data, format strings, measure layout
// ====================================================================
if (needUpdate) {
isUpdating = true;
lastUpdateFrame = currentFrame;
lastFontSize = TheWritableGlobalData->m_observerStatsFontSize;
refreshObserverStatsResources();
Expand Down Expand Up @@ -6127,6 +6141,7 @@ void InGameUI::drawObserverStats(Int& x, Int& y)

// Create Display Strings
if (headerStrings.size() != numCols) {
freeDisplayStrings(headerStrings);
headerStrings.clear();
for (Int i = 0; i < numCols; ++i) {
DisplayString* ds = TheDisplayStringManager->newDisplayString();
Expand All @@ -6138,12 +6153,12 @@ void InGameUI::drawObserverStats(Int& x, Int& y)
headerStrings[i]->setFont(m_observerStatsString->getFont());
headerStrings[i]->setText(headers[i]);
}

for (DisplayString* ds : cellStrings) {
if (ds)
TheDisplayStringManager->freeDisplayString(ds);
}
cellStrings.clear();
freeDisplayStrings(cellStrings);
cellStrings.reserve(players.size() * numCols);

for (const PlayerData& pd : players) {
Expand All @@ -6163,6 +6178,13 @@ void InGameUI::drawObserverStats(Int& x, Int& y)

for (Int i = 0; i < numCols; ++i) {
DisplayString* ds = TheDisplayStringManager->newDisplayString();
if (!ds) {
freeDisplayStrings(headerStrings);
freeDisplayStrings(cellStrings);
players.clear();
isUpdating = false;
return;
}
ds->setFont(m_observerStatsString->getFont());
ds->setText(cells[i]);
cellStrings.push_back(ds);
Expand Down Expand Up @@ -6193,11 +6215,15 @@ void InGameUI::drawObserverStats(Int& x, Int& y)
Int lineHeight = (m_observerStatsLineStep > 0) ? m_observerStatsLineStep : Int(16 * scale);
Int rowSpacing = Int(2 * scale);
totalHeight = (lineHeight + rowSpacing) * (1 + Int(players.size()));
isUpdating = false;
}

if (players.empty())
return;

if (cellStrings.size() != players.size() * numCols)
return;

// ====================================================================
// DRAWINGS
// ====================================================================
Expand Down Expand Up @@ -6668,3 +6694,4 @@ void InGameUI::drawGameTime()




Loading