X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_deaf.cpp;h=fd9b322c0cf947ff1a34518f63b47c6383757774;hb=63aa8d0d42f619c52d382bde3e6ba2e5e23b12ac;hp=ce6571b8c87fc2d155a7ee8b4f4c49f17a839c84;hpb=833ae95adc3d8e0b7ba0e82af4cbd173bb98431e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index ce6571b8c..fd9b322c0 100644
--- 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))
@@ -94,7 +94,7 @@ class ModuleDeaf : public Module
 			if (is_bypasschar && !is_a_uline)
 				continue; /* deliver message */
 
-			if (status && !strchr(chan->GetAllPrefixChars(i->first), status))
+			if (status && !strchr(i->second->GetAllPrefixChars(), status))
 				continue;
 
 			/* don't deliver message! */