chatterino2
Code Issues

Re-fix timeout message merging

Browse Source 
Fix #298
This commit is contained in:
Rasmus Karlsson
2018-03-31 13:59:17 +02:00
committed by fourtf
parent 964e1f249a
commit fba2967777
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/message.cpp
+3 -2
View File
@@ -31,7 +31,7 @@ MessagePtr Message::createSystemMessage(const QString &text)
message->addElement(new TimestampElement(QTime::currentTime()));
message->addElement(new TextElement(text, MessageElement::Text, MessageColor::System));
message->flags |= MessageFlags::System;
message->flags.EnableFlag(MessageFlags::System);
message->searchText = text;
return message;
@@ -72,7 +72,8 @@ MessagePtr Message::createTimeoutMessage(const QString &username, const QString
}
MessagePtr message = Message::createSystemMessage(text);
message->flags |= MessageFlags::System;
message->flags.EnableFlag(MessageFlags::System);
message->flags.EnableFlag(MessageFlags::Timeout);
message->timeoutUser = username;
return message;
}