diff options
| author | Adam <Adam@anope.org> | 2010-09-19 12:42:08 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-09-19 12:42:08 -0400 |
| commit | 22f2b25f97ac2f96d8e7a5a9731f28483e4d0a1f (patch) | |
| tree | 1b44038961b457363450ac9296532bc104d722a7 | |
| parent | ebd2997b79a44ba036277efbb837aa0701d8c782 (diff) | |
Fixed joining chanserv enforcers to unregistered channels
| -rw-r--r-- | src/channels.cpp | 2 | ||||
| -rw-r--r-- | src/chanserv.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 24d18b102..8a500d759 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -106,7 +106,7 @@ void Channel::Reset() void Channel::Sync() { - if (this->users.empty() || (this->users.size() == 1 && this->ci && this->ci->bi == this->users.front()->user)) + if (!this->HasMode(CMODE_PERM) && (this->users.empty() || (this->users.size() == 1 && this->ci && this->ci->bi == this->users.front()->user))) { new ChanServTimer(this); } diff --git a/src/chanserv.cpp b/src/chanserv.cpp index 338d0f311..b2dffcfd2 100644 --- a/src/chanserv.cpp +++ b/src/chanserv.cpp @@ -837,7 +837,7 @@ ChanServTimer::ChanServTimer(Channel *chan) : Timer(Config->CSInhabit), c(chan) { if (c->ci) c->ci->SetFlag(CI_INHABIT); - if (!c->ci->bi) + if (!c->ci || !c->ci->bi) ChanServ->Join(*c); else if (!c->FindUser(c->ci->bi)) c->ci->bi->Join(*c); |