From 86c43ca183616da63f01f283652e5d3fce141b97 Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 16 Jul 2014 22:24:55 +0000 Subject: [PATCH] (svn r26694) -Fix (r26547) [FS#6063]: When orders become invalid, reset the waiting time, but keep the travel time. --- src/order_cmd.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index f3a6d91d66..57b29f3f53 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -1870,7 +1870,19 @@ restart: break; } + /* Clear wait time */ + v->orders.list->UpdateTotalDuration(-order->GetWaitTime()); + if (order->IsWaitTimetabled()) { + v->orders.list->UpdateTimetableDuration(-order->GetTimetabledWait()); + order->SetWaitTimetabled(false); + } + order->SetWaitTime(0); + + /* Clear order, preserving travel time */ + bool travel_timetabled = order->IsTravelTimetabled(); order->MakeDummy(); + order->SetTravelTimetabled(travel_timetabled); + for (const Vehicle *w = v->FirstShared(); w != NULL; w = w->NextShared()) { /* In GUI, simulate by removing the order and adding it back */ InvalidateVehicleOrder(w, id | (INVALID_VEH_ORDER_ID << 8));