2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 19:36:02 +00:00

98_Hyperion: SetExtensionsCancel simplification

git-svn-id: https://svn.fhem.de/fhem/trunk@13321 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2017-02-03 11:42:21 +00:00
parent 6eba6fc509
commit 2cd921abd0

View File

@ -14,9 +14,9 @@ use warnings;
use Color; use Color;
use DevIo;
use JSON; use JSON;
use SetExtensions; use SetExtensions;
use DevIo;
my %Hyperion_sets = my %Hyperion_sets =
( (
@ -784,21 +784,10 @@ sub Hyperion_Set($@)
if (scalar keys %obj) if (scalar keys %obj)
{ {
Log3 $name,5,"$name: $cmd obj json: ".encode_json(\%obj); Log3 $name,5,"$name: $cmd obj json: ".encode_json(\%obj);
if (!$hash->{InSetExtensions})
{
SetExtensionsCancel($hash);
my $at = $name."_till";
CommandDelete(undef,$at)
if ($defs{$at});
Log3 $name,4,"$name SetExtensionsCancel";
}
Hyperion_Call($hash,\%obj); Hyperion_Call($hash,\%obj);
return undef; return undef;
} }
$hash->{InSetExtensions} = 1; return SetExtensions($hash,$params,$name,@aa);
my $ret = SetExtensions($hash,$params,$name,@aa);
delete $hash->{InSetExtensions};
return $ret;
} }
sub Hyperion_Attr(@) sub Hyperion_Attr(@)