From fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 8 Oct 2011 19:19:20 +0300 Subject: Fix global message sound hightligt. It was broken for some time. --- src/gui/widgets/chattab.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 485e96e74..9a29ae204 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -281,21 +281,15 @@ void ChatTab::chatLog(std::string line, Own own, { if (getFlash() == 0) { - if (player_node) - { - if (chatWindow && chatWindow->findHighlight(tmp.text)) - setFlash(2); - else - setFlash(1); - } + if (chatWindow && chatWindow->findHighlight(tmp.text)) + setFlash(2); else - { setFlash(1); - } } } - if (getAllowHighlight() && (this != getTabbedArea()->getSelectedTab() + if ((getAllowHighlight() || own == BY_GM) + && (this != getTabbedArea()->getSelectedTab() || (Client::getIsMinimized() || (!Client::getMouseFocused() && !Client::getInputFocused())))) { -- cgit v1.2.3-60-g2f50