Clarify handshake failure messages

[user/henk/code/inspircd.git] / src / modules / m_remove.cpp

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index ef60639f44a6f649749c10ec7c0068d9b1a32eea..1bbc0931f51faf74e7e9eff2bc31469806d4b32d 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -103,11 +103,10 @@ class RemoveBase : public Command
                                /* Build up the part reason string. */
                                reason = std::string("Removed by ") + user->nick + ": " + reasonparam;
 
-                               channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
+                               channel->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
                                target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick.c_str(), user->nick.c_str(), channel->name.c_str(), reasonparam.c_str());
 
-                               if (!channel->PartUser(target, reason))
-                                       delete channel;
+                               channel->PartUser(target, reason);
                        }
                        else
                        {
@@ -214,7 +213,7 @@ class ModuleRemove : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR);
        }
 
 };