From 0189c1a0da7b87c20ad1ef66eda1cc2758aa515b Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Sat, 19 Nov 2016 10:50:01 +0000 Subject: [PATCH] 31_HUEDevice.pm: fixed warnings that happen in define if bridge device is disabeled git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@12599 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/31_HUEDevice.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/FHEM/31_HUEDevice.pm b/FHEM/31_HUEDevice.pm index 1e7628fa4..9cc1be693 100644 --- a/FHEM/31_HUEDevice.pm +++ b/FHEM/31_HUEDevice.pm @@ -256,19 +256,19 @@ sub HUEDevice_Define($$) $hash->{ID} = $hash->{helper}->{devtype}.$id; AssignIoPort($hash,$iodev) if( !$hash->{IODev} ); - if(defined($hash->{IODev}->{NAME})) { + if(defined($hash->{IODev})) { Log3 $name, 3, "$name: I/O device is " . $hash->{IODev}->{NAME}; } else { Log3 $name, 1, "$name: no I/O device"; } - $iodev = $hash->{IODev}->{NAME}; + $iodev = $hash->{IODev}->{NAME} if( defined($hash->{IODev}) ); my $code = $hash->{ID}; $code = $iodev ."-". $code if( defined($iodev) ); my $d = $modules{HUEDevice}{defptr}{$code}; return "HUEDevice device $hash->{ID} on HUEBridge $iodev already defined as $d->{NAME}." if( defined($d) - && $d->{IODev} == $hash->{IODev} + && $d->{IODev} && $hash->{IODev} && $d->{IODev} == $hash->{IODev} && $d->{NAME} ne $name ); $modules{HUEDevice}{defptr}{$code} = $hash; @@ -281,7 +281,7 @@ sub HUEDevice_Define($$) $args[3] = "" if( !defined( $args[3] ) ); if( !$hash->{helper}->{devtype} ) { - $hash->{DEF} = "$id $args[3] IODev=$iodev"; + $hash->{DEF} = "$id $args[3] IODev=$iodev" if( $iodev ); $interval = 60 if( $interval && $interval < 10 ); $hash->{INTERVAL} = $interval; @@ -306,7 +306,7 @@ sub HUEDevice_Define($$) $attr{$name}{'color-icons'} = 2 if( !defined( $attr{$name}{'color-icons'} ) && $icon_path =~ m/openautomation/ ); } elsif( $hash->{helper}->{devtype} eq 'G' ) { - $hash->{DEF} = "group $id $args[3] IODev=$iodev"; + $hash->{DEF} = "group $id $args[3] IODev=$iodev" if( $iodev ); $hash->{helper}{all_on} = -1; $hash->{helper}{any_on} = -1; @@ -319,7 +319,7 @@ sub HUEDevice_Define($$) $attr{$name}{'color-icons'} = 2 if( !defined( $attr{$name}{'color-icons'} ) && $icon_path =~ m/openautomation/ ); } elsif( $hash->{helper}->{devtype} eq 'S' ) { - $hash->{DEF} = "sensor $id $args[3] IODev=$iodev"; + $hash->{DEF} = "sensor $id $args[3] IODev=$iodev" if( $iodev ); $interval = 60 if( $interval && $interval < 1 ); $hash->{INTERVAL} = $interval;