Merge pull request #1337 from SaberUK/master+merge

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

diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index ac53e793c9e89d93269c0a945e11c2e231a5064d..6d5896ef51bd73ada8bedd4d875224030cc6a613 100644 (file)
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -51,14 +51,7 @@ class ModuleHostChange : public Module
        std::string MySeparator;
 
  public:
-       void init() CXX11_OVERRIDE
-       {
-               OnRehash(NULL);
-               Implementation eventlist[] = { I_OnRehash, I_OnUserConnect };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* host = ServerInstance->Config->ConfValue("host");
                MySuffix = host->getString("suffix");
@@ -158,7 +151,7 @@ class ModuleHostChange : public Module
                                if (!newhost.empty())
                                {
                                        user->WriteNotice("Setting your virtual host: " + newhost);
-                                       if (!user->ChangeDisplayedHost(newhost.c_str()))
+                                       if (!user->ChangeDisplayedHost(newhost))
                                                user->WriteNotice("Could not set your virtual host: " + newhost);
                                        return;
                                }