StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr1718'

Browse Source
This commit is contained in:
tux3 2015-05-24 17:20:56 +02:00
commit 4d21f34e72
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chatlog/chatmessage.cpp
View File

@ -212,11 +212,9 @@ QString ChatMessage::detectQuotes(const QString& str, MessageType type)
// quotes and action messages possible, since only first line can cause
// problems in case where there is quote in it used.
if (QRegExp("^(>|＞)( |[[]|>|[^_\\d\\W]).*").exactMatch(messageLines[i])) {
if (type != ACTION)
if (i > 0 || type != ACTION)
quotedText += "<span class=quote>" + messageLines[i] + "</span>";
else if (type == ACTION && i > 0)
quotedText += "<span class=quote>" + messageLines[i] + "</span>";
else if (type == ACTION && i == 0)
else
quotedText += messageLines[i];
} else {
quotedText += messageLines[i];