From 74cec1f0c47936f5924fd3815550beda5a0c8d20 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 2 Aug 2009 14:54:42 +0000 Subject: (svn r17039) -Fix (r16988): segfault when removing rail with waypoint remover and vice versa --- src/station_cmd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 33a516864..06c3a8c9a 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1201,7 +1201,8 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector &affected /* Check ownership of station */ T *st = T::GetByTile(tile); - if (st != NULL && _current_company != OWNER_WATER && !CheckOwnership(st->owner)) continue; + if (st == NULL) continue; + if (_current_company != OWNER_WATER && !CheckOwnership(st->owner)) continue; /* Do not allow removing from stations if non-uniform stations are not enabled * The check must be here to give correct error message -- cgit v1.2.3-70-g09d2