Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_DOIF.pm: NOTIFYDEV change fixed with %ntfyHash = ();

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20229 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2019-09-22 18:55:46 +00:00
parent 289823ad61
commit bb985ea142
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/98_DOIF.pm
View File

@ -1386,6 +1386,7 @@ sub AddRegexpTriggerDoIf
} elsif ($regexp) { } elsif ($regexp) {
$hash->{Regex}{$type}{$dev}{$element}{$regexpid}="\^$dev\$:$regexp"; $hash->{Regex}{$type}{$dev}{$element}{$regexpid}="\^$dev\$:$regexp";
} }
%ntfyHash = ();
return; return;
} }
my($regdev)=split(/:/,$regexp); my($regdev)=split(/:/,$regexp);
@ -1405,6 +1406,7 @@ sub AddRegexpTriggerDoIf
} }
$hash->{NOTIFYDEV}.=",$regdev" if ($hash->{NOTIFYDEV}!~/,$regdev(,|$)/); $hash->{NOTIFYDEV}.=",$regdev" if ($hash->{NOTIFYDEV}!~/,$regdev(,|$)/);
$hash->{Regex}{$type}{$dev}{$element}{$regexpid}=$regexp; $hash->{Regex}{$type}{$dev}{$element}{$regexpid}=$regexp;
%ntfyHash = ();
} }
sub addDOIF_Readings sub addDOIF_Readings
@ -2408,6 +2410,7 @@ DOIF_Notify($$)
$eventa = deviceEvents($dev, AttrVal($pn, "addStateEvent", 0)); $eventa = deviceEvents($dev, AttrVal($pn, "addStateEvent", 0));
$eventas = deviceEvents($dev, 1); $eventas = deviceEvents($dev, 1);
delete ($hash->{helper}{DOIF_eventas}); delete ($hash->{helper}{DOIF_eventas});
delete ($hash->{helper}{DOIF_eventa});
if ($dev->{NAME} eq "global" and (EventCheckDoif($dev->{NAME},"global",$eventa,'^INITIALIZED$') or EventCheckDoif($dev->{NAME},"global",$eventa,'^REREADCFG$'))) if ($dev->{NAME} eq "global" and (EventCheckDoif($dev->{NAME},"global",$eventa,'^INITIALIZED$') or EventCheckDoif($dev->{NAME},"global",$eventa,'^REREADCFG$')))
{ {
@ -3004,6 +3007,7 @@ CmdDoIfPerl($$)
my $i=0; my $i=0;
$hs=$hash; $hs=$hash;
$hash->{NOTIFYDEV}="global"; $hash->{NOTIFYDEV}="global";
%ntfyHash = ();
#def modify #def modify
if ($init_done) if ($init_done)
{ {
@ -3089,6 +3093,7 @@ CmdDoIf($$)
#def modify #def modify
$hash->{NOTIFYDEV}="global"; $hash->{NOTIFYDEV}="global";
%ntfyHash = ();
if ($init_done) if ($init_done)
{ {
DOIF_delTimer($hash); DOIF_delTimer($hash);
@ -3264,6 +3269,7 @@ DOIF_Attr(@)
} }
} elsif($a[0] eq "set" and $a[2] eq "disable" and $a[3] eq "1") { } elsif($a[0] eq "set" and $a[2] eq "disable" and $a[3] eq "1") {
$hash->{NOTIFYDEV}="global"; $hash->{NOTIFYDEV}="global";
%ntfyHash = ();
DOIF_delTimer($hash); DOIF_delTimer($hash);
DOIF_delAll ($hash); DOIF_delAll ($hash);
readingsBeginUpdate($hash); readingsBeginUpdate($hash);