Check icon is valid

This commit is contained in:
craig.p.drummond
2014-06-14 19:24:16 +00:00
committed by craig.p.drummond
parent ef83a507cf
commit 2b2e6bfcd6

View File

@@ -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)));