From: Sebastian Goth Date: Mon, 18 Jan 2010 22:55:30 +0000 (+0100) Subject: And don't fuckup '*' rules X-Git-Tag: 0.6-beta1~72 X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;ds=sidebyside;h=75068ed33d1ebfc2d2581d766a69e9bbc84a46f2;p=quassel.git And don't fuckup '*' rules --- diff --git a/src/common/ignorelistmanager.cpp b/src/common/ignorelistmanager.cpp index 81382b26..bd37a20e 100644 --- a/src/common/ignorelistmanager.cpp +++ b/src/common/ignorelistmanager.cpp @@ -122,7 +122,7 @@ IgnoreListManager::StrictnessType IgnoreListManager::match(const Message &msg, c return UnmatchedStrictness; foreach(IgnoreListItem item, _ignoreList) { - if(!item.isActive) + if(!item.isActive || item.type == CtcpIgnore) continue; if(item.scope == GlobalScope || (item.scope == NetworkScope && scopeMatch(item.scopeRule, network)) || (item.scope == ChannelScope && scopeMatch(item.scopeRule, msg.bufferInfo().bufferName()))) {