Delete modewatchers when unloading modules that use them to keep the server from...

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

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index b1f12e1ebd0aa7e23a0fd8572ab1f3711e58ccfb..df575f1b3c48db57e5bd7c21e244b41a3df595af 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -57,12 +57,11 @@ class ModuleConnJoin : public Module
 
                virtual void OnRehash(User* user)
                {
-                       ConfigReader* conf = new ConfigReader;
-                       JoinChan = conf->ReadValue("autojoin", "channel", 0);
+                       ConfigReader conf;
+                       JoinChan = conf.ReadValue("autojoin", "channel", 0);
                        Joinchans.clear();
                        if (!JoinChan.empty())
                                tokenize(JoinChan,Joinchans);
-                       delete conf;
                }
 
                virtual ~ModuleConnJoin()
@@ -74,11 +73,10 @@ class ModuleConnJoin : public Module
                        return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR);
                }
 
-               virtual void OnPostConnect(User* user)
+               void OnPostConnect(User* user)
                {
                        if (!IS_LOCAL(user))
                                return;
-
                        for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
                                if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
                                        Channel::JoinUser(user, it->c_str(), false, "", false, ServerInstance->Time());