diff options
| author | DukePyrolator <DukePyrolator@anope.org> | 2010-12-23 07:15:32 +0100 |
|---|---|---|
| committer | DukePyrolator <DukePyrolator@anope.org> | 2010-12-23 07:15:32 +0100 |
| commit | a0ad3c4fef7e35c68dee128950ef95c0c56849fe (patch) | |
| tree | a9096244ac74dc31d959e9b6426453de90c28d03 /src/operserv.cpp | |
| parent | 184e7b3f64beb104e2d676048fc5bf485c5ad743 (diff) | |
| parent | 265006b69176e1d8130284c63bcb50a1b67a426f (diff) | |
Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'src/operserv.cpp')
| -rw-r--r-- | src/operserv.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/operserv.cpp b/src/operserv.cpp index 46b09980d..c76b34375 100644 --- a/src/operserv.cpp +++ b/src/operserv.cpp @@ -297,6 +297,8 @@ bool XLineManager::DelXLine(XLine *x) if (it != this->XLines.end()) { + this->Del(x); + delete x; this->XLines.erase(it); @@ -427,7 +429,8 @@ XLine *XLineManager::Check(User *u) if (x->Expires && x->Expires < Anope::CurTime) { - OnExpire(x); + this->OnExpire(x); + this->Del(x); delete x; this->XLines.erase(XLines.begin() + i - 1); continue; |