X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fignorelistmanager.cpp;h=b01273eda3af01b6572d5a5258ad7990f00d86bf;hp=e2e515cddca61ecce41b5f9e249b283f0b8da06d;hb=aec9c711900a443bfa7860fa86c6e9c86b81a3e7;hpb=8f1b4ca33d65b7d9b0e5be399dbff13c9591fbce diff --git a/src/common/ignorelistmanager.cpp b/src/common/ignorelistmanager.cpp index e2e515cd..b01273ed 100644 --- a/src/common/ignorelistmanager.cpp +++ b/src/common/ignorelistmanager.cpp @@ -136,8 +136,8 @@ IgnoreListManager::StrictnessType IgnoreListManager::_match(const QString &msgCo if (!item.isActive || item.type == CtcpIgnore) continue; if (item.scope == GlobalScope - || (item.scope == NetworkScope && scopeMatch(item.scopeRule, network)) - || (item.scope == ChannelScope && scopeMatch(item.scopeRule, bufferName))) { + || (item.scope == NetworkScope && scopeMatch(network, item.scopeRule)) + || (item.scope == ChannelScope && scopeMatch(bufferName, item.scopeRule))) { QString str; if (item.type == MessageIgnore) str = msgContents; @@ -182,7 +182,7 @@ bool IgnoreListManager::ctcpMatch(const QString sender, const QString &network, foreach(IgnoreListItem item, _ignoreList) { if (!item.isActive) continue; - if (item.scope == GlobalScope || (item.scope == NetworkScope && scopeMatch(item.scopeRule, network))) { + if (item.scope == GlobalScope || (item.scope == NetworkScope && scopeMatch(network, item.scopeRule))) { QString sender_; QStringList types = item.ignoreRule.split(QRegExp("\\s+"), QString::SkipEmptyParts);