From 7be23b7e374d343f60c4b698365719a3aba7f8f2 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 15 Feb 2013 23:18:34 -0500 Subject: Fix setting modes on botserv bots in channels that have other bots in them on startup --- src/bots.cpp | 2 +- src/modes.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/bots.cpp b/src/bots.cpp index a81332ad6..4b47b1cc5 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -147,7 +147,7 @@ void BotInfo::Assign(User *u, ChannelInfo *ci) ci->bi->UnAssign(u, ci); ci->bi = this; - if (ci->c && ci->c->users.size() >= Config->BSMinUsers) + if (Me->IsSynced() && ci->c && ci->c->users.size() >= Config->BSMinUsers) this->Join(ci->c, &ModeManager::DefaultBotModes); } diff --git a/src/modes.cpp b/src/modes.cpp index e50d4affb..d8926d7e8 100644 --- a/src/modes.cpp +++ b/src/modes.cpp @@ -599,6 +599,9 @@ void ModeManager::UpdateDefaultMLock(ServerConfig *config) if (cm && cm->type == MODE_STATUS) DefaultBotModes.modes.insert(cm->name); + else + /* We don't know the mode yet so just use the mode char */ + DefaultBotModes.modes.insert(config->BotModes[i]); } } -- cgit