projects / quassel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f1227a0)
And don't fuckup '*' rules
authorSebastian Goth <seezer@roath.org>
Mon, 18 Jan 2010 22:55:30 +0000 (23:55 +0100)
committerManuel Nickschas <sputnick@quassel-irc.org>
Mon, 18 Jan 2010 23:02:31 +0000 (00:02 +0100)
src/common/ignorelistmanager.cpp patch | blob | history

diff --git a/src/common/ignorelistmanager.cpp b/src/common/ignorelistmanager.cpp
index 81382b2..bd37a20 100644 (file)
--- 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) {
     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()))) {
       continue;
     if(item.scope == GlobalScope || (item.scope == NetworkScope && scopeMatch(item.scopeRule, network)) ||
        (item.scope == ChannelScope && scopeMatch(item.scopeRule, msg.bufferInfo().bufferName()))) {
Quassel IRC