From 2e929a88a928d505f3897788c29beb9d6b95f56b Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Thu, 16 May 2019 20:01:56 +0100 Subject: [PATCH] TBTR: Fix incorrect deletion of template vehicles when deleting company (cherry picked from commit fff3018b4272e45a2558c3d0d66a6f1a7a113ce6) --- src/economy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/economy.cpp b/src/economy.cpp index 2eb46a0929..9487bcbf32 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -490,7 +490,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner) if (new_owner == INVALID_OWNER) { TemplateVehicle *tv; FOR_ALL_TEMPLATES(tv) { - if (tv->owner == old_owner) { + if (tv->owner == old_owner && tv->Prev() == nullptr) { TemplateReplacement *tr; FOR_ALL_TEMPLATE_REPLACEMENTS(tr) { if (tr->Template() == tv->index) {