From f1946af7075588e7dd8544c59828b2a5762b3c72 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Wed, 3 Jul 2019 22:22:50 +0100
Subject: [PATCH] TBTR: Delete leftover virtual trains on non-network client
 load

---
 src/saveload/vehicle_sl.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp
index bb3db3fe3e..3405066d38 100644
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -368,6 +368,15 @@ void AfterLoadVehicles(bool part_of_load)
 				v->SetServiceIntervalIsPercent(c->settings.vehicle.servint_ispercent);
 			}
 		}
+
+		if (SlXvIsFeaturePresent(XSLFI_TEMPLATE_REPLACEMENT) && (_network_server || !_networking)) {
+			Train *t;
+			FOR_ALL_TRAINS(t) {
+				if (t->IsVirtual() && t->First() == t) {
+					delete t;
+				}
+			}
+		}
 	}
 
 	CheckValidVehicles();