Merge pull request #1337 from SaberUK/master+merge

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 559f28ea87cdde4d330fe6535aae07fa0313ad00..e97e1b02f82c60a2d8de790e8097051ae210256d 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -181,7 +181,7 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
        void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE
        {
                /* On nickchange, if they have +r, remove it */
-               if (user->IsModeSet(m5) && assign(user->nick) != oldnick)
+               if ((user->IsModeSet(m5)) && (ServerInstance->FindNickOnly(oldnick) != user))
                        m5.RemoveMode(user);
        }