summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDukePyrolator <DukePyrolator@5417fbe8-f217-4b02-8779-1006273d7864>2010-03-21 08:43:12 +0000
committerDukePyrolator <DukePyrolator@5417fbe8-f217-4b02-8779-1006273d7864>2010-03-21 08:43:12 +0000
commit872a00242e89a007cce82c593218eda226f7edda (patch)
tree8051c87ba38b40cdfab5433178c83200b7792fe8 /src
parentd70948d81ec247f825cb8fd82d7362d5c67e8772 (diff)
assigned botserv bots will now join permanent channels when syncing with our uplink
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2827 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/channels.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/channels.c b/src/channels.c
index 45b4f9d8c..4d9ec807b 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -157,8 +157,9 @@ void Channel::JoinUser(User *user)
* make it into the channel, leaving the channel botless even for
* legit users - Rob
* But don't join the bot if the channel is persistant - Adam
+ * But join persistant channels when syncing with our uplink- DP
**/
- if (Config.s_BotServ && this->ci && this->ci->bi && !this->ci->HasFlag(CI_PERSIST))
+ if (Config.s_BotServ && this->ci && this->ci->bi && ((serv_uplink->sync == SSYNC_IN_PROGRESS) || !this->ci->HasFlag(CI_PERSIST)))
{
if (this->users.size() == Config.BSMinUsers)
bot_join(this->ci);