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

[user/henk/code/inspircd.git] / src / cmd_kick.cpp

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 29e0860e05a3b803141b616465783cbdd704592f..1da6d356f496a9d01b93c3375ecfdd2e15c70362 100644 (file)
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -20,11 +20,11 @@
 #include "helperfuncs.h"
 #include "commands/cmd_kick.h"
 
-void cmd_kick::Handle (char **parameters, int pcnt, userrec *user)
+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 (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;
 }