summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-04-30 00:08:36 +0000
committerAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-04-30 00:08:36 +0000
commitf07adb2b2557f927c3d1d08a3157356b9f990abf (patch)
tree6fd5a996cc5e800ec356d01d8ed397ff441dd5f0
parentab7e4301705b35fd947df688447d33fa399d66be (diff)
Do not join ChanServ to hold channels if the channel is syncing
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2922 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--src/regchannel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index aa2f9d3eb..a205e7228 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -633,10 +633,10 @@ akick->nc->display : akick->mask);
Alog(LOG_DEBUG) << "channel: Autokicking "<< user->GetMask() << " from " << this->name;
- /* If the channel doesnt have any users and if a bot isn't already in the channel, join it
+ /* If the channel isn't syncing and doesn't have any users, join ChanServ
* NOTE: we use usercount == 1 here as there is one user, but they are about to be destroyed
*/
- if (this->c->users.size() == 1 && !this->HasFlag(CI_INHABIT))
+ if (this->c->users.size() == 1 && !this->HasFlag(CI_INHABIT) && !this->c->HasFlag(CH_SYNCING))
{
/* If channel was forbidden, etc, set it +si to prevent rejoin */
if (set_modes)