diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-23 22:38:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-23 22:38:33 +0300 |
| commit | c5327f3b1d10171ff2a97546ea49e350b1725c24 (patch) | |
| tree | 2cd1ada4c5db1ad3452bcf7aca9c424c0ed848d2 /src/gui/windows/chatwindow.cpp | |
| parent | db1e60556c72b1b87ff2a384c556ccca724c46d6 (diff) | |
| parent | 6bed768bc416eed0212b62e70731d2c40cd1b69b (diff) | |
| download | plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.tar.gz plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.tar.bz2 plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.tar.xz plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/windows/chatwindow.cpp')
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 79cf0eff3..576ff9fd4 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -1495,15 +1495,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); } } |