From a4bc2480063d1acc13ba7e49e03277d0f204aa17 Mon Sep 17 00:00:00 2001 From: tslagle13 Date: Wed, 14 Dec 2016 11:40:02 -0800 Subject: [PATCH] One further fix for NPEs --- .../color-coordinator.src/color-coordinator.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smartapps/michaelstruck/color-coordinator.src/color-coordinator.groovy b/smartapps/michaelstruck/color-coordinator.src/color-coordinator.groovy index d36805c..dc5dfb7 100644 --- a/smartapps/michaelstruck/color-coordinator.src/color-coordinator.groovy +++ b/smartapps/michaelstruck/color-coordinator.src/color-coordinator.groovy @@ -34,7 +34,7 @@ preferences { def mainPage() { dynamicPage(name: "mainPage", title: "", install: true, uninstall: false) { - def masterInList = slaves.id.find{it==master.id} + def masterInList = slaves?.id?.find{it==master?.id} if (masterInList) { section ("**WARNING**"){ paragraph "You have included the Master Light in the Slave Group. This will cause a loop in execution. Please remove this device from the Slave Group.", image: "https://raw.githubusercontent.com/MichaelStruck/SmartThingsPublic/master/img/caution.png" @@ -83,7 +83,7 @@ def init() { //----------------------------------- def onOffHandler(evt){ if (slaves && master) { - if (!slaves?.id.find{it==master.id}){ + if (!slaves?.id.find{it==master?.id}){ if (master?.currentValue("switch") == "on"){ if (randomYes) getRandomColorMaster() else slaves?.on() @@ -97,7 +97,7 @@ def onOffHandler(evt){ def colorHandler(evt) { if (slaves && master) { - if (!slaves?.id?.find{it==master.id} && master?.currentValue("switch") == "on"){ + if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){ log.debug "Changing Slave units H,S,L" def dimLevel = master?.currentValue("level") def hueLevel = master?.currentValue("hue")