Fix b0f9cc38: Assertion failure still occurs via different path

2 years ago · ab823ad808
parent d00e93baff
commit ab823ad808
1 changed files with 2 additions and 1 deletions
--- 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