From 066170fbc56bb5bd33a5ce0b9b7b668a3f539ee6 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 13 Feb 2015 02:50:36 +0200
Subject: [PATCH] Don't eat away departure delay while halted

---
 source/libr2c2/trainrouter.cpp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index a5a63b4..4a5c2bb 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -1,3 +1,4 @@
+#include "driver.h"
 #include "layout.h"
 #include "route.h"
 #include "trackiter.h"
@@ -225,24 +226,27 @@ void TrainRouter::message(const Message &msg)
 
 void TrainRouter::tick(const Time::TimeDelta &dt)
 {
-	if(delay)
-	{
-		delay -= dt;
-		if(delay<Time::zero)
-		{
-			duration = max(duration+delay, Time::zero);
-			delay = Time::zero;
-		}
-	}
-	else if(duration)
-		duration = max(duration-dt, Time::zero);
-
 	if(waypoints_changed && !planner)
 		start_planning(train.get_layout());
 
 	if(planner && planner->check()!=TrainRoutePlanner::PENDING)
 		apply_plan(train.get_layout(), *planner);
 
+	if(!train.get_layout().get_driver().is_halted())
+	{
+		if(delay)
+		{
+			delay -= dt;
+			if(delay<Time::zero)
+			{
+				duration = max(duration+delay, Time::zero);
+				delay = Time::zero;
+			}
+		}
+		else if(duration)
+			duration = max(duration-dt, Time::zero);
+	}
+
 	if(sequence_check_pending)
 	{
 		if(sequence_points.front().is_cleared())
-- 
2.43.0