From 686a0d7750405d10088a23732f33359728039aa5 Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Tue, 5 Dec 2006 22:40:42 +0000
Subject: (svn r7385) -Fix:  FS#418 Deleting Train in depot with autoreplace
 failes   This turned out to be due to continue to drag the old vehicle, that
 autoreplace sold   This could also be triggered if more than one player used
 the same company   Now deleting a vehicle will remove all depot highlights of
 that vehicle

---
 depot.h     |  2 ++
 depot_gui.c | 18 ++++++++++++++++++
 vehicle.c   |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/depot.h b/depot.h
index c52c3292a..7cf25a1b1 100644
--- a/depot.h
+++ b/depot.h
@@ -107,4 +107,6 @@ Depot *GetDepotByTile(TileIndex tile);
 void InitializeDepots(void);
 Depot *AllocateDepot(void);
 
+void DeleteDepotHighlightOfVehicle(const Vehicle *v);
+
 #endif /* DEPOT_H */
diff --git a/depot_gui.c b/depot_gui.c
index da879bb42..c0ee00ddc 100644
--- a/depot_gui.c
+++ b/depot_gui.c
@@ -1033,3 +1033,21 @@ void ShowDepotWindow(TileIndex tile, byte type)
 		ResizeDepotButtons(w);
 	}
 }
+
+/** Removes the highlight of a vehicle in a depot window
+ * @param *v Vehicle to remove all highlights from
+ */
+void DeleteDepotHighlightOfVehicle(const Vehicle *v)
+{
+	Window* const *wz;
+
+	FOR_ALL_WINDOWS(wz) {
+		const Window *w = *wz;
+		if (w->window_class != WC_VEHICLE_DEPOT) continue;
+		if (w->window_number != v->tile) continue;
+		if (WP(w, depot_d).sel == v->index) {
+			WP(w, depot_d).sel = INVALID_VEHICLE;
+			ResetObjectToPlace();
+		}
+	}
+}
diff --git a/vehicle.c b/vehicle.c
index 9c657483c..0cf909efb 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -566,6 +566,8 @@ void DestroyVehicle(Vehicle *v)
 		InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
 	}
 
+	DeleteDepotHighlightOfVehicle(v);
+
 	UpdateVehiclePosHash(v, INVALID_COORD, 0);
 	v->next_hash = INVALID_VEHICLE;
 	if (v->orders != NULL) DeleteVehicleOrders(v);
-- 
cgit v1.2.3-70-g09d2