From 02d2f61628927de7b86bba2f9455dcf05c37f78d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 25 Dec 2013 01:36:11 +0300 Subject: dont show over head text if text ignored or going to trade tab. --- src/gui/windows/chatwindow.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/gui/windows/chatwindow.cpp') diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index ea7a372d4..d658ae183 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -1452,7 +1452,7 @@ std::string ChatWindow::autoCompleteHistory(const std::string &partName) const return autoComplete(nameList, partName); } -void ChatWindow::resortChatLog(std::string line, Own own, +bool ChatWindow::resortChatLog(std::string line, Own own, const std::string &channel, const bool ignoreRecord, const bool tryRemoveColors) @@ -1470,7 +1470,7 @@ void ChatWindow::resortChatLog(std::string line, Own own, { tradeChatTab->chatLog(prefix + line, own, ignoreRecord, tryRemoveColors); - return; + return false; } size_t idx2 = line.find(": "); @@ -1481,11 +1481,11 @@ void ChatWindow::resortChatLog(std::string line, Own own, { // ignore special message formats. if (line.find(": \302\202\302") != std::string::npos) - return; + return false; line = line.erase(idx + 2, 2); tradeChatTab->chatLog(prefix + line, own, ignoreRecord, tryRemoveColors); - return; + return false; } } @@ -1502,7 +1502,7 @@ void ChatWindow::resortChatLog(std::string line, Own own, { tradeChatTab->chatLog(prefix + line, own, ignoreRecord, tryRemoveColors); - return; + return false; } } } @@ -1533,6 +1533,7 @@ void ChatWindow::resortChatLog(std::string line, Own own, { localChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors); } + return true; } void ChatWindow::battleChatLog(const std::string &line, Own own, -- cgit v1.2.3-70-g09d2