diff options
| -rw-r--r-- | src/chanserv.c | 5 | ||||
| -rw-r--r-- | src/regchannel.cpp | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/chanserv.c b/src/chanserv.c index 622f823d7..a99066b86 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1206,10 +1206,7 @@ void ChanServTimer::Tick(time_t) if (!c->users.empty()) return; - if (c->ci->bi) - ircdproto->SendPart(c->ci->bi, c, NULL); - else - ircdproto->SendPart(findbot(Config.s_ChanServ), c, NULL); + ircdproto->SendPart(findbot(Config.s_ChanServ), c, NULL); /* Now delete the channel as it is empty */ if (!c->HasFlag(CH_PERSIST) && !c->ci->HasFlag(CI_PERSIST)) diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 97251b977..aa2f9d3eb 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -647,13 +647,10 @@ akick->nc->display : akick->mask); c->SetMode(NULL, CMODE_INVITE); } - /* This channel has no bot assigned to it, join ChanServ */ - if (!this->bi) - { - ircdproto->SendJoin(findbot(Config.s_ChanServ), this->name.c_str(), this->c->creation_time); - } + /* Join ChanServ */ + ircdproto->SendJoin(findbot(Config.s_ChanServ), this->name.c_str(), this->c->creation_time); - /* Set a timer for this channel to part the bots later */ + /* Set a timer for this channel to part ChanServ later */ new ChanServTimer(this->c); } |