@@ -40,13 +40,13 @@ private:
char *name;
int priority;
typedef std::map<std::string, DriverFactoryBase *> Drivers;
static Drivers &GetDrivers()
{
static Drivers s_drivers;
static Drivers &s_drivers = *new Drivers();
return s_drivers;
}
static Driver **GetActiveDriver(Driver::Type type)
static Driver *s_driver[3] = { NULL, NULL, NULL };
@@ -68,13 +68,20 @@ public:
{}
/** Frees memory used for this->name
*/
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);
/** Shuts down all active drivers
static void ShutdownDrivers()
Status change: