From 55143d5f18e82f02b1766e1d2377f099f5a66e6a Mon Sep 17 00:00:00 2001 From: brain Date: Fri, 8 Sep 2006 15:52:41 +0000 Subject: [PATCH] Only put out SANICK success line if the nickchange succeeds git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5164 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_sanick.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index bbecfb9cf..65ef97d4b 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -49,17 +49,17 @@ class cmd_sanick : public command_t } if (ServerInstance->IsNick(parameters[1])) { - // FIX by brain: Cant use source->nick here because if it traverses a server link then - // source->nick becomes invalid as the object data moves in memory. - ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]); - if (!source->ForceNickChange(parameters[1])) + if (source->ForceNickChange(parameters[1])) + { + ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]); + return CMD_SUCCESS; + } + else { /* We couldnt change the nick */ userrec::QuitUser(ServerInstance, source, "Nickname collision"); return CMD_FAILURE; } - - return CMD_SUCCESS; } return CMD_FAILURE; -- 2.39.2