Remove current time parameter of the Timer constructor

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

diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp
index 27f8ec32f7584d1e322419d0c284e7b381144d5c..d7dceaf95c43018e4124ee97381038cce6303457 100644 (file)
--- a/src/modules/m_clearchan.cpp
+++ b/src/modules/m_clearchan.cpp
@@ -93,10 +93,11 @@ class CommandClearChan : public Command
 
                std::string mask;
                // Now remove all local non-opers from the channel
-               const UserMembList* users = chan->GetUsers();
-               for (UserMembCIter i = users->begin(); i != users->end(); )
+               UserMembList& users = chan->userlist;
+               for (UserMembIter i = users.begin(); i != users.end(); )
                {
                        User* curr = i->first;
+                       const UserMembIter currit = i;
                        ++i;
 
                        if (!IS_LOCAL(curr) || curr->IsOper())
@@ -105,7 +106,7 @@ class CommandClearChan : public Command
                        // If kicking users, remove them and skip the QuitUser()
                        if (kick)
                        {
-                               chan->KickUser(ServerInstance->FakeClient, curr, reason);
+                               chan->KickUser(ServerInstance->FakeClient, currit, reason);
                                continue;
                        }