98_Hyperion: fix SetExtensionsCancel

git-svn-id: https://svn.fhem.de/fhem/trunk@12356 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe
2016-10-16 22:27:58 +00:00
parent 2c47e3829a
commit 40daf7d68d

View File

@@ -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(@)