X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fclientignorelistmanager.cpp;h=2f112efa116ebcdfb551d1859211a1312f6abaca;hb=c27d5bfbe80bfeb583a25404f4ccee4b70b010e0;hp=02a4e23fa70f8fbc28361c159073ef70f67d0e41;hpb=04315f46a16fc3627218377071e008b6b9744992;p=quassel.git diff --git a/src/client/clientignorelistmanager.cpp b/src/client/clientignorelistmanager.cpp index 02a4e23f..2f112efa 100644 --- a/src/client/clientignorelistmanager.cpp +++ b/src/client/clientignorelistmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -50,8 +50,8 @@ QMap ClientIgnoreListManager::matchingRulesForHostmask(const QStr QMap result; foreach(IgnoreListItem item, ignoreList()) { if (item.type == SenderIgnore && pureMatch(item, hostmask) - && ((network.isEmpty() && channel.isEmpty()) || item.scope == GlobalScope || (item.scope == NetworkScope && scopeMatch(item.scopeRule, network)) - || (item.scope == ChannelScope && scopeMatch(item.scopeRule, channel)))) { + && ((network.isEmpty() && channel.isEmpty()) || item.scope == GlobalScope || (item.scope == NetworkScope && scopeMatch(network, item.scopeRule)) + || (item.scope == ChannelScope && scopeMatch(channel, item.scopeRule)))) { result[item.ignoreRule] = item.isActive; // qDebug() << "matchingRulesForHostmask found: " << item.ignoreRule << "is active: " << item.isActive; }