Let's try that +k fix again, this time with more testing

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11184 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 6 insertions, 7 deletions

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index 092f69fca..a09131354 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -91,12 +91,11 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s
 	if (parameter.rfind(' ') != std::string::npos)
 		return MODEACTION_DENY;
 
-	channel->SetMode('k', adding);
-	if (adding) {
-		std::string ckey;
-		ckey.assign(parameter, 0, 32);
-		channel->SetModeParam('k', ckey.c_str(), adding);
-		parameter = ckey;
-	}
+	std::string ckey;
+	ckey.assign(parameter, 0, 32);
+	parameter = ckey;
+	if (adding && exists)
+		channel->SetMode('k', false);
+	channel->SetModeParam('k', parameter.c_str(), adding);
 	return MODEACTION_ALLOW;
 }