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

(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one

Browse Source
This commit is contained in:
smatz
2008-05-08 23:26:17 +00:00
parent ee0a49c91a
commit 273448436a
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/driver.h
View File

@@ -43,7 +43,7 @@ private:
static Drivers &GetDrivers()
{
static Drivers &s_drivers = *new Drivers();
static Drivers s_drivers;
return s_drivers;
}
@@ -67,7 +67,23 @@ public:
name(NULL)
{}
virtual ~DriverFactoryBase() { if (this->name != NULL) GetDrivers().erase(this->name); free(this->name); }
/** Frees memory used for this->name
*/
virtual ~DriverFactoryBase() {
if (this->name == NULL) return;
GetDrivers().erase(this->name);
free(this->name);
}
/** Shuts down all active drivers
*/
static void ShutdownDrivers()
{
for (Driver::Type dt = Driver::DT_BEGIN; dt < Driver::DT_END; dt++) {
Driver *driver = *GetActiveDriver(dt);
if (driver != NULL) driver->Stop();
}
}
static const Driver *SelectDriver(const char *name, Driver::Type type);
static char *GetDriversInfo(char *p, const char *last);