From 40daf7d68d5f14f3dbcca818d9a322b9d4ab02c1 Mon Sep 17 00:00:00 2001 From: deespe Date: Sun, 16 Oct 2016 22:27:58 +0000 Subject: [PATCH] 98_Hyperion: fix SetExtensionsCancel git-svn-id: https://svn.fhem.de/fhem/trunk@12356 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_Hyperion.pm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/98_Hyperion.pm b/fhem/FHEM/98_Hyperion.pm index a0f960f2d..67c2b5fa4 100644 --- a/fhem/FHEM/98_Hyperion.pm +++ b/fhem/FHEM/98_Hyperion.pm @@ -142,7 +142,7 @@ sub Hyperion_Notify($$) return if ($dev->{NAME} ne "global"); return if (!grep(m/^INITIALIZED|REREADCFG$/, @{$dev->{CHANGED}})); return undef if (AttrVal($name,"disable",0)); - Hyperion_OpenDev($hash); + Hyperion_Read($hash); return undef; } @@ -730,13 +730,21 @@ sub Hyperion_Set($@) if (scalar keys %obj) { Log3 $name,5,"$name: $cmd obj json: ".encode_json(\%obj); - SetExtensionsCancel($hash); + if (!$hash->{InSetExtensions}) + { + SetExtensionsCancel($hash); + my $at = $name."_till"; + CommandDelete(undef,$at) + if ($defs{$at}); + Log3 $name,4,"$name SetExtensionsCancel"; + } Hyperion_Call($hash,\%obj); + return undef; } - else - { - return SetExtensions($hash,$sets,$name,@aa) ; - } + $hash->{InSetExtensions} = 1; + my $ret = SetExtensions($hash,$sets,$name,@aa); + delete $hash->{InSetExtensions}; + return $ret; } sub Hyperion_Attr(@)