summaryrefslogtreecommitdiff
path: root/src/gui/windows/chatwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-11-16 14:50:52 +0300
committerAndrei Karas <akaras@inbox.ru>2013-11-16 14:50:52 +0300
commitde2d305a18ab00881de0a22f17d6307ddffe943e (patch)
treeb86977bc86365ce212c19ca2eecc711382d02f86 /src/gui/windows/chatwindow.cpp
parent3007ca23605bd15418de6773f79ae94604cc430c (diff)
downloadmv-de2d305a18ab00881de0a22f17d6307ddffe943e.tar.gz
mv-de2d305a18ab00881de0a22f17d6307ddffe943e.tar.bz2
mv-de2d305a18ab00881de0a22f17d6307ddffe943e.tar.xz
mv-de2d305a18ab00881de0a22f17d6307ddffe943e.zip
fix "show all languages messages" option for client with language tab disabled.
Diffstat (limited to 'src/gui/windows/chatwindow.cpp')
-rw-r--r--src/gui/windows/chatwindow.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 508166510..35c8659b4 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1496,15 +1496,23 @@ void ChatWindow::resortChatLog(std::string line, Own own,
}
}
- if (langChatTab && !channel.empty())
+ if (!channel.empty())
{
- if (langChatTab->getChannelName() == channel)
+ if (langChatTab)
{
- langChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors);
+ if (langChatTab->getChannelName() == channel)
+ {
+ langChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors);
+ }
+ else if (mShowAllLang)
+ {
+ langChatTab->chatLog(prefix + line, own,
+ ignoreRecord, tryRemoveColors);
+ }
}
else if (mShowAllLang)
{
- langChatTab->chatLog(prefix + line, own,
+ localChatTab->chatLog(prefix + line, own,
ignoreRecord, tryRemoveColors);
}
}