(svn r14558) -Fix (r13957): Converting the track type of a tunnel/bridge could cause trains to get stuck.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index e7c9956ab..3b3621c46 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -1393,7 +1393,8 @@ CommandCost CmdConvertRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 						Track track = DiagDirToDiagTrack(GetTunnelBridgeDirection(tile));
 						if (GetTunnelBridgeReservation(tile)) {
 							Vehicle *v = GetTrainForReservation(tile, track);
-							if (v != NULL) {
+							if (v != NULL && !HasPowerOnRail(v->u.rail.railtype, totype)) {
+								/* No power on new rail type, reroute. */
 								FreeTrainTrackReservation(v);
 								*vehicles_affected.Append() = v;
 							}