From 535f71fc13ced5ed1f68886fcd5aebb47d35f53c Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 8 Sep 2009 12:22:28 +0000 Subject: [PATCH] (svn r17472) -Fix [FS#3182]: industry list was rebuilt too early during industry removal causing the removed industry to be still in the list after removal --- src/industry.h | 1 + src/industry_cmd.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/industry.h b/src/industry.h index 32f403f96e..76a41d4869 100644 --- a/src/industry.h +++ b/src/industry.h @@ -84,6 +84,7 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> { } static Industry *GetRandom(); + static void PostDestructor(size_t index); }; void PlantRandomFarmField(const Industry *i); diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 584a7e87ed..05e9cb1b70 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -176,10 +176,18 @@ Industry::~Industry() DeleteIndustryNews(this->index); DeleteWindowById(WC_INDUSTRY_VIEW, this->index); - InvalidateWindowData(WC_INDUSTRY_DIRECTORY, 0, 0); DeleteSubsidyWith(ST_INDUSTRY, this->index); CargoPacket::InvalidateAllFrom(ST_INDUSTRY, this->index); +} + +/** + * Invalidating some stuff after removing item from the pool. + * @param index index of deleted item + */ +void Industry::PostDestructor(size_t index) +{ + InvalidateWindowData(WC_INDUSTRY_DIRECTORY, 0, 0); Station::RecomputeIndustriesNearForAll(); }