diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/channels.cpp | 2 | ||||
| -rw-r--r-- | src/modes.cpp | 15 | ||||
| -rw-r--r-- | src/users.cpp | 4 |
3 files changed, 20 insertions, 1 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 4ba9049a9..6e1e25f23 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -47,6 +47,8 @@ Channel::~Channel() { FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this)); + ModeManager::StackerDel(this); + Log(NULL, this, "destroy"); for (std::list<BanData *>::iterator it = this->bd.begin(), it_end = this->bd.end(); it != it_end; ++it) diff --git a/src/modes.cpp b/src/modes.cpp index 23cd0e402..f28e6a4b4 100644 --- a/src/modes.cpp +++ b/src/modes.cpp @@ -822,3 +822,18 @@ void ModeManager::ProcessModes() StackerObjects.clear(); } } + +/** Delete a user or channel from the stacker + * @param b The user/channel + */ +void ModeManager::StackerDel(Base *b) +{ + for (std::list<std::pair<Base *, StackerInfo *> >::iterator it = ModeManager::StackerObjects.begin(), it_end = ModeManager::StackerObjects.end(); it != it_end; ++it) + { + if (b == it->first) + { + ModeManager::StackerObjects.erase(it); + break; + } + } +} diff --git a/src/users.cpp b/src/users.cpp index 12502efae..9aa67b174 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -188,10 +188,12 @@ User::~User() Log(this, "disconnect") << "(" << this->realname << ") " << "disconnected from the network (" << this->server->GetName() << ")"; - this->Logout(); FOREACH_MOD(I_OnUserLogoff, OnUserLogoff(this)); + ModeManager::StackerDel(this); + this->Logout(); + --usercnt; if (is_oper(this)) |