revert 5fcdc072d706 for now
authoralfadur
Thu, 26 Sep 2019 19:36:56 +0300
changeset 15424 3207dd5fdfd2
parent 15423 e0f148794328
child 15425 a6699f4a3d16
revert 5fcdc072d706 for now
QTfrontend/net/newnetclient.cpp
QTfrontend/ui/widget/chatwidget.cpp
--- a/QTfrontend/net/newnetclient.cpp	Thu Sep 26 19:03:14 2019 +0300
+++ b/QTfrontend/net/newnetclient.cpp	Thu Sep 26 19:36:56 2019 +0300
@@ -438,10 +438,6 @@
             // 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);
             }
--- a/QTfrontend/ui/widget/chatwidget.cpp	Thu Sep 26 19:03:14 2019 +0300
+++ b/QTfrontend/ui/widget/chatwidget.cpp	Thu Sep 26 19:36:56 2019 +0300
@@ -426,6 +426,10 @@
     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;