From 3769b4f218a761fb31f3cfbd636a4d9e9365b4f9 Mon Sep 17 00:00:00 2001
From: yexo <yexo@openttd.org>
Date: Thu, 3 Mar 2011 19:26:18 +0000
Subject: (svn r22163) -Fix [FS#4541]: building a station part adjacent to both
 an existing station and a rail waypoint failed

---
 src/station_cmd.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 98b919870..859753325 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -92,9 +92,10 @@ CommandCost GetStationAround(TileArea ta, StationID closest_station, T **st)
 	TILE_AREA_LOOP(tile_cur, ta) {
 		if (IsTileType(tile_cur, MP_STATION)) {
 			StationID t = GetStationIndex(tile_cur);
+			if (!T::IsValidID(t)) continue;
 
 			if (closest_station == INVALID_STATION) {
-				if (T::IsValidID(t)) closest_station = t;
+				closest_station = t;
 			} else if (closest_station != t) {
 				return_cmd_error(STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING);
 			}
-- 
cgit v1.2.3-54-g00ecf