mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity

Only access widgets that actually exist (#24899)

Browse Source 
Some windows, like the NetworkStatus do not create any additional
widgets which results in WidgetCaptionDraw going off the widget vector
This commit is contained in:
Michał Janiszewski
2025-08-06 08:10:51 +02:00
committed by GitHub
parent b9c3306c3d
commit 8efb075201
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2-ui/interface/Widget.cpp
View File

@@ -559,10 +559,13 @@ namespace OpenRCT2::Ui
topLeft = w.windowPos + ScreenCoordsXY{ widget->left + 2, widget->top + 1 };
int32_t width = widget->width() - 4;
if ((widget + 1)->type == WidgetType::closeBox)
if (static_cast<size_t>(widgetIndex + 1) < w.widgets.size()
&& (w.widgets[widgetIndex + 1]).type == WidgetType::closeBox)
{
width -= kCloseButtonSize;
if ((widget + 2)->type == WidgetType::closeBox)
if (static_cast<size_t>(widgetIndex + 2) < w.widgets.size()
&& (w.widgets[widgetIndex + 2]).type == WidgetType::closeBox)
width -= kCloseButtonSize;
}
topLeft.x += width / 2;