1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr1738'

This commit is contained in:
tux3 2015-05-25 23:25:09 +02:00
commit fdd34718fb
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -1018,7 +1018,7 @@ void ChatForm::SendMessageStr(QString msg)
int id = HistoryKeeper::getInstance()->addChatEntry(f->getToxId().publicKey, qt_msg_hist,
Core::getInstance()->getSelfId().publicKey, timestamp, status);
ChatMessage::Ptr ma = addSelfMessage(msg, isAction, timestamp, false);
ChatMessage::Ptr ma = addSelfMessage(qt_msg, isAction, timestamp, false);
int rec;
if (isAction)