From 74566d869aefab16ede2fa946a0ea7b2cfed51ef Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Fri, 17 Sep 2010 14:32:46 -0400
Subject: Fixed bug #1190 and prevent m_dnsbl from akilling a user multiple
 times if they are in multiple blacklists

---
 src/regchannel.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index fb8036677..ad9a0eac7 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -394,9 +394,10 @@ void ChannelInfo::LoadMLock()
 	if (this->HasFlag(CI_PERSIST) && !this->c)
 	{
 		this->c = new Channel(this->name, this->time_registered);
-		if (!this->bi)
+		if (!this->bi && ModeManager::FindChannelModeByName(CMODE_PERM) == NULL)
 			ChanServ->Assign(NULL, this);
-		this->bi->Join(c);
+		else if (this->bi)
+			this->bi->Join(c);
 		check_modes(this->c);
 		this->CheckTopic();
 	}
-- 
cgit