X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_kick.cpp;h=65b22070c2dfdb9b3f72fcf201e37bf98ea0a7e3;hb=e50d016aa23083f81dcf181f68edb81c5b23c78d;hp=d07d5383636a6d4a6c9ee79fd07e084ba8b051e9;hpb=0b878f54cfce452b6829ab00950f6d062cec0f10;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index d07d53836..65b22070c 100644
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -13,14 +13,6 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_KICK_H__
-#define __CMD_KICK_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** Handle /KICK. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -41,8 +33,6 @@ class CommandKick : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
 
 /** Handle /KICK
  */
@@ -76,9 +66,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 		reason.assign(user->nick, 0, ServerInstance->Config->Limits.MaxKick);
 	}
 
-	if (!c->KickUser(user, u, reason.c_str()))
-		/* Nobody left here, delete the Channel */
-		delete c;
+	c->KickUser(user, u, reason.c_str());
 
 	return CMD_SUCCESS;
 }