dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(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.

Browse Source
This commit is contained in:
glx
2008-05-16 21:32:10 +00:00
parent 13954aaaff
commit 0cab2cade2
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/driver.h
View File

@@ -43,7 +43,7 @@ private:
static Drivers &GetDrivers() static Drivers &GetDrivers()
{ {
static Drivers s_drivers; static Drivers &s_drivers = *new Drivers();
return s_drivers; return s_drivers;
} }
@@ -71,7 +71,14 @@ public:
*/ */
virtual ~DriverFactoryBase() { virtual ~DriverFactoryBase() {
if (this->name == NULL) return; 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); free(this->name);
} }