# HG changeset patch
# User yexo <yexo@openttd.org>
# Date 2010-11-16 23:38:05
# Node ID 49069459064aecb831171a62b0ec00f2fec1f83c
# Parent  02e59aef1ac56ff0978406eb53fda32a83815ffc

(svn r21218) -Fix (r21189)[FS#4236]: don't force a minimum speed when braking

diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2806,8 +2806,8 @@ int Train::UpdateSpeed()
 		if (this->cur_speed > max_speed) {
 			tempmax = this->cur_speed - (this->cur_speed / 10) - 1;
 		}
-		/* Force a minimum speed of 1 km/h when realistic acceleration is on. */
-		int min_speed = (_settings_game.vehicle.train_acceleration_model == AM_ORIGINAL) ? 0 : 2;
+		/* Force a minimum speed of 1 km/h when realistic acceleration is on and the train is not braking. */
+		int min_speed = (_settings_game.vehicle.train_acceleration_model == AM_ORIGINAL || this->GetAccelerationStatus() == AS_BRAKE) ? 0 : 2;
 		this->cur_speed = spd = Clamp(this->cur_speed + ((int)spd >> 8), min_speed, tempmax);
 	}