diff options
Diffstat (limited to 'src/module.cpp')
| -rw-r--r-- | src/module.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/module.cpp b/src/module.cpp index 4b13d7e94..91a7ed350 100644 --- a/src/module.cpp +++ b/src/module.cpp @@ -57,9 +57,9 @@ Module::~Module() { /* Detach all event hooks for this module */ ModuleManager::DetachAll(this); - /* Clear any active callbacks this module has */ - ModuleManager::ClearCallBacks(this); IdentifyRequest::ModuleUnload(this); + /* Clear any active timers this module has */ + TimerManager::DeleteTimersFor(this); std::list<Module *>::iterator it = std::find(ModuleManager::Modules.begin(), ModuleManager::Modules.end(), this); if (it != ModuleManager::Modules.end()) @@ -111,14 +111,3 @@ int ModuleVersion::GetPatch() const return this->version_patch; } -CallBack::CallBack(Module *mod, long time_from_now, time_t now, bool repeating) : Timer(time_from_now, now, repeating), m(mod) -{ -} - -CallBack::~CallBack() -{ - std::list<CallBack *>::iterator it = std::find(m->callbacks.begin(), m->callbacks.end(), this); - if (it != m->callbacks.end()) - m->callbacks.erase(it); -} - |