summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2009-10-28 15:12:47 +0000
committerAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2009-10-28 15:12:47 +0000
commitfa622b4e9f7212e30052536c7788139b736747f5 (patch)
treebef466b942ee50d7f9a6a7d5a18280ab4319a8d6
parent52593ef71ba2ccd57a4d49f9000dfcafb43caaf7 (diff)
Remove NickServ timers from TimerManager if we need to delete them, not just from NickServs timers - Fixes segfault reported by phantomal
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2593 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--src/nickserv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nickserv.c b/src/nickserv.c
index d77950512..0122f7517 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -49,7 +49,7 @@ class NickServCollide : public Timer
std::map<NickAlias *, NickServCollide *>::iterator nit = NickServCollides.find(nickalias);
if (nit != NickServCollides.end())
{
- NickServCollides.erase(nit);
+ TimerManager::DelTimer(nit->second);
}
it = NickServCollides.insert(std::make_pair(nickalias, this));
@@ -103,7 +103,7 @@ class NickServRelease : public Timer
std::map<NickAlias *, NickServRelease *>::iterator nit = NickServReleases.find(nickalias);
if (nit != NickServReleases.end())
{
- NickServReleases.erase(nit);
+ TimerManager::DelTimer(nit->second);
}
it = NickServReleases.insert(std::make_pair(nickalias, this));