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

98_DOIF.pm: fixed: attribute was not set when defmod is redefined if no def was set, collect data for card are no longer deleted when defmod is redefined

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25711 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2022-02-20 09:18:05 +00:00
parent 9630724460
commit b9eecaae20
1 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/98_DOIF.pm
View File

@ -77,7 +77,7 @@ sub DOIF_delAll($)
delete ($hash->{perlblock}); delete ($hash->{perlblock});
delete ($hash->{var}); delete ($hash->{var});
delete ($hash->{accu}); delete ($hash->{accu});
delete ($hash->{collect}); #delete ($hash->{collect});
delete ($hash->{Regex}); delete ($hash->{Regex});
delete ($hash->{defs}); delete ($hash->{defs});
@ -3624,10 +3624,8 @@ CmdDoIf($$)
$hash->{helper}{sleeptimer}=-1; $hash->{helper}{sleeptimer}=-1;
return("","") if ($tail =~ /^ *$/); if ($tail !~ /^ *$/) {
$tail =~ s/\n/ /g; $tail =~ s/\n/ /g;
while ($tail ne "") { while ($tail ne "") {
return($tail, "no left bracket of condition") if ($tail !~ /^ *\(/); return($tail, "no left bracket of condition") if ($tail !~ /^ *\(/);
#condition #condition
@ -3695,7 +3693,7 @@ CmdDoIf($$)
} }
$hash->{do}{$last_do+1}{0}=$else_cmd_ori if ($j==0); #doelse without brackets $hash->{do}{$last_do+1}{0}=$else_cmd_ori if ($j==0); #doelse without brackets
} }
}
if ($init_done) { if ($init_done) {
foreach my $key (keys %{$attr{$hash->{NAME}}}) { foreach my $key (keys %{$attr{$hash->{NAME}}}) {
if ($key ne "disable" and AttrVal($hash->{NAME},$key,"")) { if ($key ne "disable" and AttrVal($hash->{NAME},$key,"")) {