fix LoopCalls to not send param count thus avoiding a crash in command parser

[user/henk/code/inspircd.git] / src / modes / cmode_k.cpp

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index 3d8fc7ab3a3f8672ff58e0020db00c1a9522dbaf..0ab35b954bcd2fb4ebc34159048fd61422b0fbc5 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -33,22 +33,25 @@ ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::stri
         }
 }
 
-void ModeChannelKey::RemoveMode(Channel* channel)
+void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
        /** +k needs a parameter when being removed,
         * so we have a special-case RemoveMode here for it
         */
-       char moderemove[MAXBUF];
-       const char* parameters[] = { channel->name, moderemove, channel->key };
 
        if (channel->IsModeSet(this->GetModeChar()))
        {
-               sprintf(moderemove,"-%c",this->GetModeChar());
-               ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+               if (stack)
+                       stack->Push(this->GetModeChar(), channel->key);
+               else
+               {
+                       std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-k"); parameters.push_back(channel->key);
+                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+               }
        }
 }
 
-void ModeChannelKey::RemoveMode(User*)
+void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
@@ -58,7 +61,7 @@ bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_par
        return (their_param < our_param);
 }
 
-ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
        if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
        {