From 4184611d3a43d046f341858b97c5fb2c1783b58c Mon Sep 17 00:00:00 2001
From: hackykid <hackykid@openttd.org>
Date: Mon, 6 Jun 2005 21:32:04 +0000
Subject: (svn r2427)  - Fix: CmdMoveRailVehice; Prevent possible assertion
 failure when moving vehicles within one chain.

---
 train_cmd.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'train_cmd.c')

diff --git a/train_cmd.c b/train_cmd.c
index a2d1aeda6..d473148c0 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -845,6 +845,9 @@ int32 CmdMoveRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 				src_head = NULL;
 			}
 		} else {
+			// if moving within the same chain, dont use dst_head as it may get invalidated
+			if (src_head == dst_head)
+				dst_head = NULL;
 			// unlink single wagon from linked list
 			src_head = UnlinkWagon(src, src_head);
 			src->next = NULL;
-- 
cgit v1.2.3-54-g00ecf