[Notification] Try to fix icon in notification preview.

32b7b3bd · eekkelund · 945900fc · 32b7b3bd
Commit 32b7b3bd authored Sep 17, 2017 by eekkelund
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 10 deletions

NotificationPreview.qml src/qml/notifications/NotificationPreview.qml +12 -10

No files found.
--- a/src/qml/notifications/NotificationPreview.qml
+++ b/src/qml/notifications/NotificationPreview.qml
@@ -132,16 +132,18 @@ Item {
                width: notificationArea.notificationIconSize
                height: width
                source: {
-                    if (notificationPreviewPresenter.notification.icon) {
-                        if (notificationPreviewPresenter.notification.icon.indexOf("/") == 0)
-                            return "file://" + notificationPreviewPresenter.notification.icon
-                        else
-                            return "image://theme/" + notificationPreviewPresenter.notification.icon
-                    }else if (notificationPreviewPresenter.notification.appIcon) {
-                        if (notificationPreviewPresenter.notification.appIcon.indexOf("/") == 0)
-                            return "file://" + notificationPreviewPresenter.notification.appIcon
-                        else
-                            return "image://theme/" + notificationPreviewPresenter.notification.appIcon
+                    if(notificationPreviewPresenter.notification) {
+                        if (notificationPreviewPresenter.notification.icon) {
+                            if (notificationPreviewPresenter.notification.icon.indexOf("/") == 0)
+                                return "file://" + notificationPreviewPresenter.notification.icon
+                            else
+                                return "image://theme/" + notificationPreviewPresenter.notification.icon
+                        }else if (notificationPreviewPresenter.notification.appIcon) {
+                            if (notificationPreviewPresenter.notification.appIcon.indexOf("/") == 0)
+                                return "file://" + notificationPreviewPresenter.notification.appIcon
+                            else
+                                return "image://theme/" + notificationPreviewPresenter.notification.appIcon
+                        } else return defaultIcon
                    } else return defaultIcon
                }
                onStatusChanged: {