--- a/aircraft_cmd.c	Mon Nov 07 23:20:47 2005 +0000
+++ b/aircraft_cmd.c	Tue Nov 08 23:18:09 2005 +0000
@@ -291,7 +291,8 @@
 		InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
 		RebuildVehicleLists();
 		InvalidateWindow(WC_COMPANY, v->owner);
-		InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Aircraft); //updates the replace Aircraft window
+		if (IsLocalPlayer())
+			InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Aircraft); //updates the replace Aircraft window
 	}
 
 	return value;
@@ -348,7 +349,8 @@
 		// Invalidate depot
 		InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
 		DoDeleteAircraft(v);
-		InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Aircraft); // updates the replace Aircraft window
+		if (IsLocalPlayer())
+			InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Aircraft); // updates the replace Aircraft window
 	}
 
 	return -(int32)v->value;

--- a/roadveh_cmd.c	Mon Nov 07 23:20:47 2005 +0000
+++ b/roadveh_cmd.c	Tue Nov 08 23:18:09 2005 +0000
@@ -193,7 +193,8 @@
 		InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
 		RebuildVehicleLists();
 		InvalidateWindow(WC_COMPANY, v->owner);
-		InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Road); // updates the replace Road window
+		if (IsLocalPlayer())
+			InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Road); // updates the replace Road window
 	}
 
 	return cost;
@@ -263,8 +264,9 @@
 		DeleteWindowById(WC_VEHICLE_VIEW, v->index);
 		ClearSlot(v, v->u.road.slot);
 		DeleteVehicle(v);
+		if (IsLocalPlayer())
+			InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Road); // updates the replace Road window
 	}
-	InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Road); // updates the replace Road window
 
 	return -(int32)v->value;
 }

--- a/ship_cmd.c	Mon Nov 07 23:20:47 2005 +0000
+++ b/ship_cmd.c	Tue Nov 08 23:18:09 2005 +0000
@@ -921,7 +921,8 @@
 		InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
 		RebuildVehicleLists();
 		InvalidateWindow(WC_COMPANY, v->owner);
-		InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window
+		if (IsLocalPlayer())
+			InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window
 	}
 
 	return value;
@@ -953,7 +954,8 @@
 		InvalidateWindow(WC_COMPANY, v->owner);
 		DeleteWindowById(WC_VEHICLE_VIEW, v->index);
 		DeleteVehicle(v);
-		InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window
+		if (IsLocalPlayer())
+			InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window
 	}
 
 	return -(int32)v->value;

--- a/train_cmd.c	Mon Nov 07 23:20:47 2005 +0000
+++ b/train_cmd.c	Tue Nov 08 23:18:09 2005 +0000
@@ -773,12 +773,13 @@
 			InvalidateWindow(WC_VEHICLE_DEPOT, tile);
 			RebuildVehicleLists();
 			InvalidateWindow(WC_COMPANY, v->owner);
+			if (IsLocalPlayer()) {
+				InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train); // updates the replace Train window
+			}
 		}
 	}
 	_cmd_build_rail_veh_score = _railveh_score[p1];
 
-	InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train); // updates the replace Train window
-
 	return value;
 }
 
@@ -1128,6 +1129,8 @@
 	if (flags & DC_EXEC) {
 		if (v == first && first->subtype == TS_Front_Engine) {
 			DeleteWindowById(WC_VEHICLE_VIEW, first->index);
+		}
+		if (IsLocalPlayer() && (p1 == 1 || !(RailVehInfo(v->engine_type)->flags & RVI_WAGON))) {
 			InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train);
 		}
 		InvalidateWindow(WC_VEHICLE_DEPOT, first->tile);