Merge branch 'master+gnutlsprio'

[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..b22dbdf4dc69bee8b5078b725b8b452f2a0c4592 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)
        {
        }