Merge branch 'master+sslconnmsg'

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

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 9800b32a98438ef98297a4de05fc93361dfd8ed9..fd9b322c0cf947ff1a34518f63b47c6383757774 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -66,7 +66,6 @@ class ModuleDeaf : public Module
                        return MOD_RES_PASSTHRU;
 
                Channel* chan = static_cast<Channel*>(dest);
-               const UserMembList *ulist = chan->GetUsers();
                bool is_bypasschar = (deaf_bypasschars.find(text[0]) != std::string::npos);
                bool is_bypasschar_uline = (deaf_bypasschars_uline.find(text[0]) != std::string::npos);
 
@@ -77,7 +76,8 @@ class ModuleDeaf : public Module
                if (!deaf_bypasschars_uline.empty() && is_bypasschar)
                        return MOD_RES_PASSTHRU;
 
-               for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
+               const Channel::MemberMap& ulist = chan->GetUsers();
+               for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
                {
                        /* not +d ? */
                        if (!i->first->IsModeSet(m1))