(svn r17542) -Fix: don't access variables in the company struct after it has been deleted

-Cleanup: remove some never-used code

1 files changed, 4 insertions, 1 deletions

diff --git a/src/economy.cpp b/src/economy.cpp
index cca81413a..340b6fdb7 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1553,8 +1553,11 @@ CommandCost CmdBuyCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 	/* Do not allow companies to take over themselves */
 	if ((CompanyID)p1 == _current_company) return CMD_ERROR;
 
+	/* Get the cost here as the company is deleted in DoAcquireCompany. */
+	CommandCost cost(EXPENSES_OTHER, c->bankrupt_value);
+
 	if (flags & DC_EXEC) {
 		DoAcquireCompany(c);
 	}
-	return CommandCost(EXPENSES_OTHER, c->bankrupt_value);
+	return cost;
 }