mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 22:13:07 +01:00
Code Issues Releases Wiki Activity

Fix: Crash on opening scenery window after removing tabs

Browse Source 
The crash occurred because gWindowSceneryTabSelections did not get cleared when the window is not open, yet this is a global variable that needs clearing. The function that handles this (WindowSceneryResetSelectedSceneryItems) gets called with the `INTENT_ACTION_REFRESH_SCENERY` intent.
This commit is contained in:
Hielke Morsink
2022-04-09 17:42:17 +02:00
parent 90ab449f78
commit c995abc25e
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2-ui/windows/Scenery.cpp
View File

@@ -730,12 +730,6 @@ public:
OnMouseDown(WIDX_SCENERY_TAB_1 + tabId);
}
// Used after removing objects, in order to avoid crashes.
void ResetSelectedSceneryItems()
{
gWindowSceneryTabSelections.clear();
}
void Init()
{
_tabEntries.clear();
@@ -1383,11 +1377,8 @@ void WindowScenerySetSelectedTab(const ObjectEntryIndex sceneryGroupIndex)
// Used after removing objects, in order to avoid crashes.
void WindowSceneryResetSelectedSceneryItems()
{
auto* w = static_cast<SceneryWindow*>(window_find_by_class(WC_SCENERY));
if (w != nullptr)
{
w->ResetSelectedSceneryItems();
}
gWindowSceneryTabSelections.clear();
gWindowSceneryActiveTabIndex = 0;
}
void WindowScenerySetDefaultPlacementConfiguration()
@@ -1397,8 +1388,7 @@ void WindowScenerySetDefaultPlacementConfiguration()
gWindowScenerySecondaryColour = COLOUR_YELLOW;
gWindowSceneryTertiaryColour = COLOUR_DARK_BROWN;
gWindowSceneryTabSelections.clear();
gWindowSceneryActiveTabIndex = 0;
WindowSceneryResetSelectedSceneryItems();
}
void WindowSceneryInit()