Clear order wait times when changing to a non-stopping order

2022-01-12 19:16:42 +00:00
parent dd312ef9a4
commit 9e1a78c86e
2 changed files with 7 additions and 1 deletions
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -1891,6 +1891,9 @@ CommandCost CmdModifyOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 					order->SetRefit(CT_NO_REFIT);
 					order->SetLoadType(OLF_LOAD_IF_POSSIBLE);
 					order->SetUnloadType(OUF_UNLOAD_IF_POSSIBLE);
+					if (order->IsWaitTimetabled() || order->GetWaitTime() > 0) {
+						DoCommandEx(tile, v->index | (MTF_WAIT_TIME << 28) | (1 << 31), 0, p3, flags, CMD_CHANGE_TIMETABLE);
+					}
 				}
 				break;