diff --git a/nymea-app/ui/MagicPage.qml b/nymea-app/ui/MagicPage.qml index 44d08c47..b2ad453c 100644 --- a/nymea-app/ui/MagicPage.qml +++ b/nymea-app/ui/MagicPage.qml @@ -140,8 +140,8 @@ Page { delegate: NymeaSwipeDelegate { id: ruleDelegate width: parent.width - iconName: "../images/" + (model.executable ? (iconTag.value.length > 0 ? iconTag.value : "slideshow") : "magic") + ".svg" - iconColor: model.executable ? (colorTag.value.length > 0 ? colorTag.value : Style.accentColor) : !model.enabled ? "red" : (model.active ? Style.accentColor : "grey") + iconName: "../images/" + (model.executable ? (iconTag && iconTag.value.length > 0 ? iconTag.value : "slideshow") : "magic") + ".svg" + iconColor: model.executable ? (colorTag && colorTag.value.length > 0 ? colorTag.value : Style.accentColor) : !model.enabled ? "red" : (model.active ? Style.accentColor : "grey") text: model.name canDelete: true diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml index 3087e021..e2cc7ca2 100644 --- a/nymea-app/ui/mainviews/ScenesView.qml +++ b/nymea-app/ui/mainviews/ScenesView.qml @@ -58,7 +58,7 @@ MainViewBase { height: interfacesGridView.cellHeight iconName: iconTag ? "../images/" + iconTag.value + ".svg" : "../images/slideshow.svg"; fallbackIconName: "../images/slideshow.svg" - iconColor: colorTag.value.length > 0 ? colorTag.value : Style.accentColor; + iconColor: colorTag && colorTag.value.length > 0 ? colorTag.value : Style.accentColor; text: model.name.toUpperCase() property var colorTag: engine.tagsManager.tags.findRuleTag(model.id, "color")