From 83e1fdcb0167c36729889511f7b1165038044c88 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sun, 5 Aug 2007 21:20:55 +0000
Subject: (svn r10799) -Fix: only calling QuickFree and not the destructor on
 pool cleanups might cause memory leaks due to the way C++ works.

---
 src/town_cmd.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/town_cmd.cpp')

diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 4fa9a8c85..48b20ffc7 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -53,6 +53,10 @@ Town::Town(TileIndex tile)
 
 Town::~Town()
 {
+	DeleteName(this->townnametype);
+
+	if (CleaningPool()) return;
+
 	Industry *i;
 
 	/* Delete town authority window
@@ -87,15 +91,9 @@ Town::~Town()
 
 	MarkWholeScreenDirty();
 
-	this->QuickFree();
 	this->xy = 0;
 }
 
-void Town::QuickFree()
-{
-	DeleteName(this->townnametype);
-}
-
 // Local
 static int _grow_town_result;
 
-- 
cgit v1.2.3-54-g00ecf