X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientignorelistmanager.cpp;h=2f112efa116ebcdfb551d1859211a1312f6abaca;hp=e7d701f789499ef2cac76de3cd932adbdfb98401;hb=aec9c711900a443bfa7860fa86c6e9c86b81a3e7;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c diff --git a/src/client/clientignorelistmanager.cpp b/src/client/clientignorelistmanager.cpp index e7d701f7..2f112efa 100644 --- a/src/client/clientignorelistmanager.cpp +++ b/src/client/clientignorelistmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 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; }