FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-30 05:57:08 +00:00
Code Issues Releases Wiki Activity

98_Hyperion: add BlockingKill on disable

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15514 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2017-11-28 13:06:49 +00:00
parent d86afd5918
commit fa1f3900c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/98_Hyperion.pm
View File

@ -565,8 +565,8 @@ sub Hyperion_Set($@)
return if (IsDisabled($name) && $cmd ne "?"); return if (IsDisabled($name) && $cmd ne "?");
my $value = (defined($args[0])) ? $args[0] : undef; my $value = (defined($args[0])) ? $args[0] : undef;
return "\"set $name\" needs at least one argument and maximum five arguments" if (@aa < 1 || @aa > 5); return "\"set $name\" needs at least one argument and maximum five arguments" if (@aa < 1 || @aa > 5);
my $duration = (defined $args[1]) ? int $args[1] : int AttrVal($name,"hyperionDefaultDuration",0); my $duration = defined $args[1] ? int $args[1] : AttrNum($name,"hyperionDefaultDuration",0);
my $priority = (defined $args[2]) ? int $args[2] : int AttrVal($name,"hyperionDefaultPriority",0); my $priority = defined $args[2] ? int $args[2] : AttrNum($name,"hyperionDefaultPriority",0);
my %Hyperion_sets_local = %Hyperion_sets; my %Hyperion_sets_local = %Hyperion_sets;
if (ReadingsVal($name,".configs","")) if (ReadingsVal($name,".configs",""))
{ {
@ -985,6 +985,7 @@ sub Hyperion_Attr(@)
return $err if ($err); return $err if ($err);
if ($attr_value == 1) if ($attr_value == 1)
{ {
BlockingKill($hash->{helper}{RUNNING_PID}) if ($hash->{helper}{RUNNING_PID});
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
DevIo_Disconnected($hash); DevIo_Disconnected($hash);
} }
@ -1000,8 +1001,7 @@ sub Hyperion_Attr(@)
Hyperion_GetUpdate($hash) if (!IsDisabled($name)); Hyperion_GetUpdate($hash) if (!IsDisabled($name));
Hyperion_OpenDev($hash) if ($attr_name eq "disable"); Hyperion_OpenDev($hash) if ($attr_name eq "disable");
} }
return $err if ($err); return $err ? $err : undef;
return;
} }
sub Hyperion_Call($;$) sub Hyperion_Call($;$)