diff options
| author | Hal9OOO <miglietta.francesco@gmail.com> | 2012-12-04 23:04:47 +0100 |
|---|---|---|
| committer | Hal9OOO <miglietta.francesco@gmail.com> | 2012-12-04 23:04:47 +0100 |
| commit | ee7c35db55d587136970712158481cd3d94d3db5 (patch) | |
| tree | b51d6ec189ea4a1a9aa592e70afd67943ad3aa97 /src/gui | |
| parent | c91fb6d5826a39ab0f560737936ca16b019946c2 (diff) | |
| parent | 29890cc253fc9230ec815433f1f5a923998c9439 (diff) | |
| download | manaplus-ee7c35db55d587136970712158481cd3d94d3db5.tar.gz manaplus-ee7c35db55d587136970712158481cd3d94d3db5.tar.bz2 manaplus-ee7c35db55d587136970712158481cd3d94d3db5.tar.xz manaplus-ee7c35db55d587136970712158481cd3d94d3db5.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/chatwindow.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 11f399537..c0258eade 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -1410,12 +1410,19 @@ void ChatWindow::resortChatLog(std::string line, Own own, return; } - const size_t idx = line.find(": \302\202"); - if (idx != std::string::npos) + const size_t idx2 = line.find(": "); + if (idx2 != std::string::npos) { - line = line.erase(idx + 2, 2); - tradeChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors); - return; + const size_t idx = line.find(": \302\202"); + if (idx == idx2) + { + // ignore special message formats. + if (line.find(": \302\202\302") != std::string::npos) + return; + line = line.erase(idx + 2, 2); + tradeChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors); + return; + } } const size_t idx1 = line.find("@@"); |