summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-10-08 19:19:20 +0300
committerAndrei Karas <akaras@inbox.ru>2011-10-08 19:19:20 +0300
commitfe5fef730b92f2c1db3f2e7cf8cc2465ee99edec (patch)
tree905ac2c274355fc78a4bc5f2aa3635c27cc512a9 /src
parent521ef3e740ef2ec9db1554dab13cc6e5cac24199 (diff)
downloadplus-fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec.tar.gz
plus-fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec.tar.bz2
plus-fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec.tar.xz
plus-fe5fef730b92f2c1db3f2e7cf8cc2465ee99edec.zip
Fix global message sound hightligt. It was broken for some time.
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/chattab.cpp14
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()))))
{