Changeset - r9260:a54ed53b7134
[Not reviewed]
master
0 1 0
glx - 16 years ago 2008-05-16 21:32:10
glx@openttd.org
(svn r13126) -Fix (r13022) [FS#2009, FS#2010]: driver list should be dynamically allocated as static uninitialistion order is undetermined. The list is freed when the latest driver is removed.
1 file changed with 9 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/driver.h
Show inline comments
 
@@ -43,7 +43,7 @@ private:
 

	
 
	static Drivers &GetDrivers()
 
	{
 
		static Drivers s_drivers;
 
		static Drivers &s_drivers = *new Drivers();
 
		return s_drivers;
 
	}
 

	
 
@@ -71,7 +71,14 @@ public:
 
	 */
 
	virtual ~DriverFactoryBase() {
 
		if (this->name == NULL) return;
 
		GetDrivers().erase(this->name);
 

	
 
		/* Prefix the name with driver type to make it unique */
 
		char buf[32];
 
		strecpy(buf, GetDriverTypeName(type), lastof(buf));
 
		strecpy(buf + 5, this->name, lastof(buf));
 

	
 
		GetDrivers().erase(buf);
 
		if (GetDrivers().empty()) delete &GetDrivers();
 
		free(this->name);
 
	}
 

	
0 comments (0 inline, 0 general)