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 'pr1389'

Browse Source
This commit is contained in:
tux3 2015-03-14 19:49:04 +01:00
commit c5a8a17e21
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/widget/widget.cpp
View File

@ -412,6 +412,7 @@ void Widget::onAddClicked()
hideMainForms(); hideMainForms();
addFriendForm->show(*ui); addFriendForm->show(*ui);
setWindowTitle(tr("Add friend")); setWindowTitle(tr("Add friend"));
activeChatroomWidget = nullptr;
} }
void Widget::onGroupClicked() void Widget::onGroupClicked()
@ -704,7 +705,7 @@ void Widget::onFriendMessageReceived(int friendId, const QString& message, bool
HistoryKeeper::getInstance()->addChatEntry(f->getToxID().publicKey, isAction ? "/me " + message : message, HistoryKeeper::getInstance()->addChatEntry(f->getToxID().publicKey, isAction ? "/me " + message : message,
f->getToxID().publicKey, timestamp, true); f->getToxID().publicKey, timestamp, true);
f->setEventFlag(static_cast<GenericChatroomWidget*>(f->getFriendWidget()) != activeChatroomWidget); f->setEventFlag(f->getFriendWidget() != activeChatroomWidget);
newMessageAlert(f->getFriendWidget()); newMessageAlert(f->getFriendWidget());
f->getFriendWidget()->updateStatusLight(); f->getFriendWidget()->updateStatusLight();
} }