From b81ed893e15cad280af7c5e3c20291c2638b9349 Mon Sep 17 00:00:00 2001
From: Matt Lowe <matthewneillowe@gmail.com>
Date: Mon, 4 May 2015 12:40:51 +0200
Subject: [PATCH] Can now disable desktop mentions

Was not checking if the setting was enabled
---
 cockatrice/src/chatview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cockatrice/src/chatview.cpp b/cockatrice/src/chatview.cpp
index 80e07042..4b40d22a 100644
--- a/cockatrice/src/chatview.cpp
+++ b/cockatrice/src/chatview.cpp
@@ -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);
                 }