From ab823ad80843e6abe015fc652158bfbd29f82676 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 29 Jan 2022 14:27:50 +0000 Subject: [PATCH] Fix b0f9cc38: Assertion failure still occurs via different path --- src/rail_gui.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 6b1e9f61c0..8430f35ab9 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -2277,7 +2277,8 @@ struct BuildRailWaypointWindow : PickerWindowBase { this->FinishInitNested(TRANSPORT_RAIL); matrix->SetCount(_waypoint_count); - matrix->SetClicked(_cur_waypoint_type < _waypoint_count ? _cur_waypoint_type : 0); + if (_cur_waypoint_type >= _waypoint_count) _cur_waypoint_type = 0; + matrix->SetClicked(_cur_waypoint_type); } void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override