(svn r10931) -Fix [FS#1131]: when a station was destroyed and a vehicle was still loading, changing the current order of the loading vehicle caused a crash. This could happen with removing docks and oil rigs.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/station.cpp b/src/station.cpp
index fab0395b7..16723fc68 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -69,6 +69,10 @@ Station::~Station()
 
 	if (CleaningPool()) return;
 
+	while (!loading_vehicles.empty()) {
+		loading_vehicles.front()->LeaveStation();
+	}
+
 	MarkDirty();
 	RebuildStationLists();
 	InvalidateWindowClasses(WC_STATION_LIST);