mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-12-11 23:05:49 -05:00
fixed duplicate code (posibly due to problem while merging)
This commit is contained in:
parent
350a3da359
commit
1e3be2b159
1 changed files with 0 additions and 7 deletions
|
|
@ -242,13 +242,6 @@ void FriendsDialog::chatMessageReceived(const ChatMessage &msg)
|
||||||
if(!msg.chat_id.isBroadcast())
|
if(!msg.chat_id.isBroadcast())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
QDateTime sendTime = QDateTime::fromTime_t(msg.sendTime);
|
|
||||||
QDateTime recvTime = QDateTime::fromTime_t(msg.recvTime);
|
|
||||||
QString message = QString::fromUtf8(msg.msg.c_str());
|
|
||||||
QString name = QString::fromUtf8(rsPeers->getPeerName(msg.broadcast_peer_id).c_str());
|
|
||||||
|
|
||||||
ui.chatWidget->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL);
|
|
||||||
|
|
||||||
if(ui.chatWidget->isActive())
|
if(ui.chatWidget->isActive())
|
||||||
{
|
{
|
||||||
QDateTime sendTime = DateTime::DateTimeFromTime_t(msg.sendTime);
|
QDateTime sendTime = DateTime::DateTimeFromTime_t(msg.sendTime);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue