From 2e063e6df8deeafa27bf2abbc606cc3aeab86354 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Mon, 1 Nov 2021 18:32:28 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20#15831:=20Track=20Manager=20crash=20after?= =?UTF-8?q?=20clicking=20=E2=80=9CSelect=20another=20ride=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/openrct2-ui/windows/TrackList.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 53ece652db..e81f70296b 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -208,8 +208,19 @@ public: String::Set(_filterString, sizeof(_filterString), ""); window_track_list_widgets[WIDX_FILTER_STRING].string = _filterString; widgets = window_track_list_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BACK) | (1ULL << WIDX_FILTER_STRING) - | (1ULL << WIDX_FILTER_CLEAR) | (1ULL << WIDX_ROTATE) | (1ULL << WIDX_TOGGLE_SCENERY); + enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_FILTER_STRING) | (1ULL << WIDX_FILTER_CLEAR) + | (1ULL << WIDX_ROTATE) | (1ULL << WIDX_TOGGLE_SCENERY); + + if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) + { + enabled_widgets &= ~(1ULL << WIDX_BACK); + widgets[WIDX_BACK].type = WindowWidgetType::Empty; + } + else + { + enabled_widgets |= (1ULL << WIDX_BACK); + widgets[WIDX_BACK].type = WindowWidgetType::TableHeader; + } WindowInitScrollWidgets(this); track_list.track_list_being_updated = false;