From 567c853c49fdf3d6502666f2a70070598d0fc88c Mon Sep 17 00:00:00 2001 From: Damian <> Date: Thu, 8 Feb 2018 19:24:27 +0000 Subject: [PATCH] 98_DOIF.pm: Bugfix set checkall: $DEVICE reset git-svn-id: https://svn.fhem.de/fhem/trunk@16124 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_DOIF.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/98_DOIF.pm b/fhem/FHEM/98_DOIF.pm index c30354424..f059cf4e3 100644 --- a/fhem/FHEM/98_DOIF.pm +++ b/fhem/FHEM/98_DOIF.pm @@ -884,7 +884,7 @@ sub EventDoIf my $dev=$hash->{helper}{triggerDev}; my $eventa=$hash->{helper}{triggerEvents}; if ($check) { - if ($dev ne $n) { + if ($dev eq "" or $dev ne $n) { if (defined $filter) { return ($default) } else { @@ -892,7 +892,7 @@ sub EventDoIf } } } else { - if ($n and $dev !~ /$n/) { + if ($dev eq "" or $n and $dev !~ /$n/) { if (defined $filter) { return ($default) } else { @@ -2947,6 +2947,7 @@ DOIF_Set($@) delete ($defs{$hash->{NAME}}{READINGS}{last_cmd}); readingsSingleUpdate ($hash,"mode","enabled",1) } elsif ($arg eq "checkall" ) { + $hash->{helper}{triggerDev}=""; DOIF_Trigger ($hash,$pn,1); } elsif ($arg =~ /^cmd_(.*)/ ) { if (ReadingsVal($pn,"mode","") ne "disabled") {