From e2a7ecbcaee04068c5504f0b6aa2be1b26e3f298 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Thu, 23 Dec 2010 07:17:00 +0000
Subject: [PATCH] (svn r21605) -Fix [FS#4324]: crash due to cargo payments
 belonging to an non-existing company

---
 src/economy.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/economy.cpp b/src/economy.cpp
index 9d7d78143b..886a076584 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -382,6 +382,9 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 					v->colourmap = PAL_NONE;
 					if (v->IsEngineCountable()) Company::Get(new_owner)->num_engines[v->engine_type]++;
 					if (v->IsPrimaryVehicle()) v->unitnumber = unitidgen[v->type].NextID();
+
+					/* Invalidate the vehicle's cargo payment "owner cache". */
+					if (v->cargo_payment != NULL) v->cargo_payment->owner = NULL;
 				}
 			}
 		}