# HG changeset patch # User S-D- # Date 1568925580 -10800 # Node ID 5fcdc072d7065d35756743fa685561bfa8192172 # Parent f1e0e92ab7f3658038ce4be636d9c4fbab583bbc Ignore chat messages from ignore list nicks in game too diff -r f1e0e92ab7f3 -r 5fcdc072d706 QTfrontend/net/newnetclient.cpp --- a/QTfrontend/net/newnetclient.cpp Thu Sep 19 17:06:47 2019 +0200 +++ b/QTfrontend/net/newnetclient.cpp Thu Sep 19 23:39:40 2019 +0300 @@ -438,6 +438,10 @@ // Another kind of fake nick. '(' nicks are server messages, but they must not be translated if(!sender.startsWith('(')) { + // don't handle chat messages that are from ignored nicks + if (m_playersModel->isFlagSet(sender, PlayersListModel::Ignore)) + return; + // Check for action (/me command) action = HWProto::chatStringToAction(message); } diff -r f1e0e92ab7f3 -r 5fcdc072d706 QTfrontend/ui/widget/chatwidget.cpp --- a/QTfrontend/ui/widget/chatwidget.cpp Thu Sep 19 17:06:47 2019 +0200 +++ b/QTfrontend/ui/widget/chatwidget.cpp Thu Sep 19 23:39:40 2019 +0300 @@ -426,10 +426,6 @@ if(!m_usersModel) return; - // don't show chat lines that are from ignored nicks - if (m_usersModel->isFlagSet(nick, PlayersListModel::Ignore)) - return; - bool isFriend = (!nick.isEmpty()) && m_usersModel->isFlagSet(nick, PlayersListModel::Friend); QString cssClass = (isFriend ? "msg_Friend" : "msg_User") + cssClassPart;