From 01ebfad80973be6f8a843256c7823f69cb40b3b0 Mon Sep 17 00:00:00 2001 From: dP Date: Sun, 5 Mar 2023 02:52:30 +0400 Subject: [PATCH] Fix 3719f60: Crash when copying non-station orders (#10540) --- src/order_cmd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 56c306856f..cc7dd9ed9b 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -1577,8 +1577,9 @@ CommandCost CmdCloneOrder(DoCommandFlag flags, CloneOptions action, VehicleID ve /* Trucks can't copy all the orders from busses (and visa versa), * and neither can helicopters and aircraft. */ for (const Order *order : src->Orders()) { + if (!OrderGoesToStation(dst, order)) continue; Station *st = Station::Get(order->GetDestination()); - if (OrderGoesToStation(dst, order) && !CanVehicleUseStation(dst, st)) { + if (!CanVehicleUseStation(dst, st)) { return CommandCost(STR_ERROR_CAN_T_COPY_SHARE_ORDER, GetVehicleCannotUseStationReason(dst, st)); } }