From 041088d317c89050796823928215588b3d61aa57 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 29 Sep 2019 22:48:19 +0200 Subject: Fix fbbbc6e1931: Crash when creating orders to stations with relocated station sign. (#7755) Station::xy is the position of the station sign, and not necessarily a tile of the station. --- src/order_gui.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/order_gui.cpp b/src/order_gui.cpp index fa56f70cb..7364ccd8a 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -410,8 +410,7 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) default: NOT_REACHED(); } if (st->facilities & facil) { - StationID st_index = GetStationIndex(st->xy); - order.MakeGoToStation(st_index); + order.MakeGoToStation(st->index); if (_ctrl_pressed) order.SetLoadType(OLF_FULL_LOAD_ANY); if (_settings_client.gui.new_nonstop && v->IsGroundVehicle()) order.SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); order.SetStopLocation(v->type == VEH_TRAIN ? (OrderStopLocation)(_settings_client.gui.stop_location) : OSL_PLATFORM_FAR_END); -- cgit v1.2.3-70-g09d2