diff -r 0e5480e9af1e -r 0cf0a95ebaf9 src/airport_gui.cpp
--- a/src/airport_gui.cpp	Thu May 15 14:12:22 2008 +0000
+++ b/src/airport_gui.cpp	Thu May 15 14:41:56 2008 +0000
@@ -102,9 +102,7 @@
 		case WE_ABORT_PLACE_OBJ:
 			w->RaiseButtons();
 
-			w = FindWindowById(WC_BUILD_STATION, 0);
-			if (w != 0)
-				WP(w, def_d).close = true;
+			delete FindWindowById(WC_BUILD_STATION, 0);
 			break;
 
 		case WE_DESTROY:
@@ -171,8 +169,6 @@
 			uint32 avail_airports;
 			const AirportFTAClass *airport;
 
-			if (WP(w, def_d).close) return;
-
 			avail_airports = GetValidAirports();
 
 			w->RaiseWidget(_selected_airport_type + BAW_SMALL_AIRPORT);
@@ -230,17 +226,12 @@
 			}
 		} break;
 
-		case WE_TICK: {
-			if (WP(w, def_d).close) {
-				delete w;
-				return;
-			}
-
+		case WE_TICK:
 			CheckRedrawStationCoverage(w);
-		} break;
+			break;
 
 		case WE_DESTROY:
-			if (!WP(w, def_d).close) ResetObjectToPlace();
+			ResetObjectToPlace();
 			break;
 	}
 }