--- a/src/vehicle.cpp	Sat Oct 20 16:50:48 2007 +0000
+++ b/src/vehicle.cpp	Sat Oct 20 17:11:02 2007 +0000
@@ -529,6 +529,14 @@
 	if ((this->type == VEH_TRAIN && EngineHasArticPart(this)) || (this->type == VEH_ROAD && RoadVehHasArticPart(this))) {
 		delete this->Next();
 	}
+
+	Window **wp;
+	FOR_ALL_WINDOWS(wp) {
+		Window *w = *wp;
+		if (w->viewport != NULL && WP(w, vp_d).follow_vehicle == this->index) {
+			WP(w, vp_d).follow_vehicle = INVALID_VEHICLE;
+		}
+	}
 }
 
 Vehicle::~Vehicle()