Merge pull request #495 from SaberUK/master+fix-libcpp

[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 6b13ab1aab8da7556d193cd8249b4e394c9ef391..113e49dffa48b0172830dbab53a340ba8c9baf57 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -45,22 +45,22 @@ class ModuleConnJoin : public Module
 
                void OnPostConnect(User* user)
                {
-                       if (!IS_LOCAL(user))
+                       LocalUser* localuser = IS_LOCAL(user);
+                       if (!localuser)
                                return;
 
                        std::string chanlist = ServerInstance->Config->ConfValue("autojoin")->getString("channel");
-                       chanlist = user->GetClass()->config->getString("autojoin", chanlist);
+                       chanlist = localuser->GetClass()->config->getString("autojoin", chanlist);
 
                        irc::commasepstream chans(chanlist);
                        std::string chan;
 
                        while (chans.GetToken(chan))
                        {
-                               if (ServerInstance->IsChannel(chan.c_str(), ServerInstance->Config->Limits.ChanMax))
-                                       Channel::JoinUser(user, chan.c_str(), false, "", false, ServerInstance->Time());
+                               if (ServerInstance->IsChannel(chan, ServerInstance->Config->Limits.ChanMax))
+                                       Channel::JoinUser(localuser, chan);
                        }
                }
 };
 
-
 MODULE_INIT(ModuleConnJoin)