From 2b2e6bfcd6e8c8cffb39349038ceddb7ec0014dc Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Sat, 14 Jun 2014 19:24:16 +0000
Subject: [PATCH] Check icon is valid

---
 gui/trayitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/trayitem.cpp b/gui/trayitem.cpp
index e9cc53fa5..ef928edaf 100644
--- a/gui/trayitem.cpp
+++ b/gui/trayitem.cpp
@@ -146,7 +146,7 @@ void TrayItem::setup()
         icon.addFile(iconFile);
     }
     #endif
-    trayItem->setIcon(icon.isNull() ? Icons::self()->appIcon : icon);
+    trayItem->setIcon(icon.isNull() || icon.pixmap(16, 16).isNull() ? Icons::self()->appIcon : icon);
     trayItem->setToolTip(i18n("Cantata"));
     trayItem->show();
     connect(trayItem, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayItemClicked(QSystemTrayIcon::ActivationReason)));