Merge pull request #1300 from SaberUK/master+genssl

[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 631e5945ce3623e658d07efd88e23e9f6112ca57..bd8d89dc9b54365e895da7f7ad626b0e7778e8e9 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -43,7 +43,7 @@ class JoinTimer : public Timer
 
  public:
        JoinTimer(LocalUser* u, SimpleExtItem<JoinTimer>& ex, const std::string& chans, unsigned int delay)
-               : Timer(delay, ServerInstance->Time(), false)
+               : Timer(delay, false)
                , user(u), channels(chans), ext(ex)
        {
                ServerInstance->Timers.AddTimer(this);
@@ -66,7 +66,8 @@ class ModuleConnJoin : public Module
        unsigned int defdelay;
 
  public:
-       ModuleConnJoin() : ext("join_timer", this)
+       ModuleConnJoin()
+               : ext("join_timer", ExtensionItem::EXT_USER, this)
        {
        }
 
@@ -77,7 +78,7 @@ class ModuleConnJoin : public Module
                defdelay = tag->getInt("delay", 0, 0, 60);
        }
 
-       void Prioritize()
+       void Prioritize() CXX11_OVERRIDE
        {
                ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
        }