From 71d28afe67af5635dfdd7b7af544e494a1d60a7b Mon Sep 17 00:00:00 2001
From: alberth <alberth@openttd.org>
Date: Fri, 5 Mar 2010 21:34:12 +0000
Subject: (svn r19320) -Fix (r19291): Forgot to set error message.

---
 src/rail_cmd.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/rail_cmd.cpp')

diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index eb29fef07..c989c10fc 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -1478,8 +1478,11 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 							TileY(endtile) >= sy && TileY(endtile) <= ey) continue;
 
 					/* When not coverting rail <-> el. rail, any vehicle cannot be in tunnel/bridge */
-					if (!IsCompatibleRail(GetRailType(tile), totype) &&
-							TunnelBridgeIsFree(tile, endtile).Failed()) continue;
+					if (!IsCompatibleRail(GetRailType(tile), totype)) {
+						CommandCost ret = TunnelBridgeIsFree(tile, endtile);
+						ret.SetGlobalErrorMessage();
+						if (ret.Failed()) continue;
+					}
 
 					if (flags & DC_EXEC) {
 						Track track = DiagDirToDiagTrack(GetTunnelBridgeDirection(tile));
-- 
cgit v1.2.3-54-g00ecf