From 48cf43d0aba330bacb5dc0122f0f9d247c2db0b7 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Thu, 4 Sep 2014 12:30:40 +0200 Subject: [PATCH] m_spanningtree Apply FMODE mode changes using the new ModeParser functions --- src/modules/m_spanningtree/fmode.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp index 56757a8b7..52e512d92 100644 --- a/src/modules/m_spanningtree/fmode.cpp +++ b/src/modules/m_spanningtree/fmode.cpp @@ -41,16 +41,15 @@ CmdResult CommandFMode::Handle(User* who, std::vector& params) /* TS is equal or less: Merge the mode changes into ours and pass on. */ - std::vector modelist; - modelist.reserve(params.size()-1); - /* Insert everything into modelist except the TS (params[1]) */ - modelist.push_back(params[0]); - modelist.insert(modelist.end(), params.begin()+2, params.end()); + + // Turn modes into a Modes::ChangeList; may have more elements than max modes + Modes::ChangeList changelist; + ServerInstance->Modes.ModeParamsToChangeList(who, MODETYPE_CHANNEL, params, changelist, 2); ModeParser::ModeProcessFlag flags = ModeParser::MODE_LOCALONLY; if ((TS == ourTS) && IS_SERVER(who)) flags |= ModeParser::MODE_MERGE; - ServerInstance->Modes->Process(modelist, who, flags); + ServerInstance->Modes->Process(who, chan, NULL, changelist, flags); return CMD_SUCCESS; } -- 2.39.5