kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 4743f47df..1da6d356f 100644
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -24,7 +24,7 @@ void cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	char reason[MAXKICK];
 	chanrec* c = FindChan(parameters[0]);
-	userrec* u   = Find(parameters[1]);
+	userrec* u = Find(parameters[1]);
 
 	if (!u || !c)
 	{
@@ -47,5 +47,7 @@ void cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
 		strlcpy(reason, user->nick, MAXKICK - 1);
 	}
 
-	kick_channel(user, u, c, reason);
+	if (!c->KickUser(user, u, reason))
+		/* Nobody left here, delete the chanrec */
+		delete c;
 }