Annotations

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

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 60e83a172357b29a7f375c8012fe2d62f68f2f2c..9f967bb0b62f0cc209f593f74ee1d22e91f0fa7f 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -47,18 +47,18 @@ class cmd_sanick : public command_t
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
                                return CMD_FAILURE;
                        }
+                       std::string oldnick = user->nick;
                        if (ServerInstance->IsNick(parameters[1]))
                        {
                                if (source->ForceNickChange(parameters[1]))
                                {
-                                       ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+                                       ServerInstance->WriteOpers(oldnick+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
                                        return CMD_SUCCESS;
                                }
                                else
                                {
                                        /* We couldnt change the nick */
-                                       ServerInstance->WriteOpers(std::string(user->nick)+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
-                                       userrec::QuitUser(ServerInstance, source, "Nickname collision");
+                                       ServerInstance->WriteOpers(oldnick+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
                                        return CMD_FAILURE;
                                }
                        }