mirror of
https://github.com/anope/anope.git
synced 2026-06-29 13:36:38 +02:00
Don't dynamically allocate commands in modules anymore, instead made them members of modules. This means the commands are automatically destructed when the module is unloaded. Cleans up some old ugly code.
This commit is contained in:
@@ -69,6 +69,7 @@ class CSSetMisc : public Module
|
||||
Anope::string Name;
|
||||
Anope::string Desc;
|
||||
bool ShowHidden;
|
||||
Command *c;
|
||||
|
||||
CommandInfo(const Anope::string &name, const Anope::string &desc, bool showhidden) : Name(name), Desc(desc), ShowHidden(showhidden) { }
|
||||
};
|
||||
@@ -89,10 +90,23 @@ class CSSetMisc : public Module
|
||||
for (std::map<Anope::string, CommandInfo *>::const_iterator it = this->Commands.begin(), it_end = this->Commands.end(); it != it_end; ++it)
|
||||
{
|
||||
if (set)
|
||||
set->DelSubcommand(it->first);
|
||||
{
|
||||
Command *c = set->FindSubcommand(it->second->Name);
|
||||
if (c)
|
||||
{
|
||||
set->DelSubcommand(c);
|
||||
delete c;
|
||||
}
|
||||
}
|
||||
if (saset)
|
||||
saset->DelSubcommand(it->first);
|
||||
delete it->second;
|
||||
{
|
||||
Command *c = saset->FindSubcommand(it->second->Name);
|
||||
if (c)
|
||||
{
|
||||
saset->DelSubcommand(c);
|
||||
delete c;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this->Commands.clear();
|
||||
|
||||
Reference in New Issue
Block a user