--- a/src/aircraft_cmd.cpp	Wed Feb 21 19:46:37 2007 +0000
+++ b/src/aircraft_cmd.cpp	Wed Feb 21 19:49:18 2007 +0000
@@ -38,7 +38,6 @@
 static bool AirportHasBlock(Vehicle *v, const AirportFTA *current_pos, const AirportFTAClass *apc);
 static bool AirportFindFreeTerminal(Vehicle *v, const AirportFTAClass *apc);
 static bool AirportFindFreeHelipad(Vehicle *v, const AirportFTAClass *apc);
-static void AirportGoToNextPosition(Vehicle *v, const AirportFTAClass *apc);
 static void CrashAirplane(Vehicle *v);
 
 static void AircraftNextAirportPos_and_Order(Vehicle *v);
@@ -1738,11 +1737,13 @@
 	}
 }
 
-static void AirportGoToNextPosition(Vehicle *v, const AirportFTAClass *apc)
+static void AirportGoToNextPosition(Vehicle *v)
 {
 	// if aircraft is not in position, wait until it is
 	if (!AircraftController(v)) return;
 
+	const AirportFTAClass *apc = GetStation(v->u.air.targetairport)->Airport();
+
 	AirportClearBlock(v, apc);
 	AirportMove(v, apc); // move aircraft to next position
 }
@@ -2006,7 +2007,7 @@
 
 	if (v->current_order.type >= OT_LOADING) return;
 
-	AirportGoToNextPosition(v, GetStation(v->u.air.targetairport)->Airport());
+	AirportGoToNextPosition(v);
 }
 
 void Aircraft_Tick(Vehicle *v)