Dynamically determine the size of the eventlist[] passed to Attach()

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

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index a905f2a37ffcb7241e8117a7b901f34b41c52cf9..af8357cf03d9c12a22e8c63d856f26a35094b362 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -108,7 +108,9 @@ class CommandCAP : public Command
                        reghold.set(user, 1);
                        Data.Send();
 
-                       std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
+                       std::string Result;
+                       if (!Data.ack.empty())
+                               Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
                        user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), Result.c_str());
                }
                else
@@ -127,12 +129,16 @@ class ModuleCAP : public Module
  public:
        ModuleCAP()
                : cmd(this)
+       {
+       }
+
+       void init()
        {
                ServerInstance->AddCommand(&cmd);
                ServerInstance->Extensions.Register(&cmd.reghold);
 
                Implementation eventlist[] = { I_OnCheckReady };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        ModResult OnCheckReady(LocalUser* user)