diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-08 19:19:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-08 19:19:20 +0300 |
| commit | fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec (patch) | |
| tree | 905ac2c274355fc78a4bc5f2aa3635c27cc512a9 | |
| parent | 521ef3e740ef2ec9db1554dab13cc6e5cac24199 (diff) | |
| download | manaplus-fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec.tar.gz manaplus-fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec.tar.bz2 manaplus-fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec.tar.xz manaplus-fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec.zip | |
Fix global message sound hightligt. It was broken for some time.
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 14 |
1 files 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())))) { |