From 8eb34b2f10a4acbed3f0ba293828c74add71c466 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Sat, 15 May 2021 22:32:50 +0100
Subject: [PATCH] Do not attach temporary wagons to free wagon chains when
 autoreplacing

See: https://github.com/OpenTTD/OpenTTD/issues/9264
---
 src/train_cmd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 823f0fbaa9..224e05364f 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -1929,7 +1929,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
 	/* if nothing is selected as destination, try and find a matching vehicle to drag to. */
 	Train *dst;
 	if (d == INVALID_VEHICLE) {
-		dst = src->IsEngine() ? nullptr : FindGoodVehiclePos(src);
+		dst = (src->IsEngine() || (flags & DC_AUTOREPLACE)) ? nullptr : FindGoodVehiclePos(src);
 	} else {
 		dst = Train::GetIfValid(d);
 		if (dst == nullptr) return check_on_failure(CMD_ERROR);