From 383a69222816d07451dc48b3935daacb8e1c6601 Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Wed, 31 Aug 2016 12:43:46 +0000 Subject: [PATCH] 31_HUEDevice.pm: SetExtensionsCancel fix git-svn-id: https://svn.fhem.de/fhem/trunk@12097 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/31_HUEDevice.pm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/31_HUEDevice.pm b/fhem/FHEM/31_HUEDevice.pm index bbe585ef8..b5f4886c7 100644 --- a/fhem/FHEM/31_HUEDevice.pm +++ b/fhem/FHEM/31_HUEDevice.pm @@ -646,7 +646,10 @@ HUEDevice_Set($@) } } - return SetExtensions($hash, $list, $name, @aa); + $hash->{InSetExtensions} = 1; + my $ret = SetExtensions($hash, $list, $name, @aa); + delete $hash->{InSetExtensions}; + return $ret; } if( $cmd eq 'rename' ) { @@ -716,7 +719,7 @@ HUEDevice_Set($@) $result = HUEDevice_ReadFromServer($hash,"$hash->{ID}/state",\%obj); } - SetExtensionsCancel($hash); + SetExtensionsCancel($hash) if( !$hash->{InSetExtensions} ); if( defined($result) && $result->{'error'} ) { $hash->{STATE} = $result->{'error'}->{'description'}; @@ -755,7 +758,11 @@ HUEDevice_Set($@) $list .= " savescene deletescene scene" if( $hash->{helper}->{devtype} eq 'G' ); $list .= " rename"; - return SetExtensions($hash, $list, $name, @aa); + $hash->{InSetExtensions} = 1; + my $ret = SetExtensions($hash, $list, $name, @aa); + delete $hash->{InSetExtensions}; + + return $ret; } sub