Merge pull request #1052 from poixen/mention_pop_fix

Can now disable desktop mentions
This commit is contained in:
Zach 2015-05-04 09:36:20 -04:00
commit 75ea89361f

View file

@ -242,7 +242,7 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
cursor.insertText(mention, mentionFormat);
message = message.mid(mention.size());
QApplication::alert(this);
if (shouldShowSystemPopup()) {
if (settingsCache->getShowMentionPopup() && shouldShowSystemPopup()) {
QString ref = sender.left(sender.length() - 2);
showSystemPopup(ref);
}