From 8e36c646d85f170fb79664c72378970a5e40b81a Mon Sep 17 00:00:00 2001 From: Damian <> Date: Fri, 27 Jan 2017 19:04:01 +0000 Subject: [PATCH] 98_DOIF.pm: fixed problem with indirect timer git-svn-id: https://svn.fhem.de/fhem/trunk@13253 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_DOIF.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/98_DOIF.pm b/fhem/FHEM/98_DOIF.pm index ce75cc53e..6b59d65bc 100644 --- a/fhem/FHEM/98_DOIF.pm +++ b/fhem/FHEM/98_DOIF.pm @@ -1175,7 +1175,7 @@ sub CheckiTimerDoIf($$$) return 1 if ($itimer =~ /\[$device\]/); for (my $j = 0; $j < $max; $j++) { if ($eventa->[$j] =~ "^(.+): ") { - $found = ($itimer =~ /\[$device:$1[:\]]/); + $found = ($itimer =~ /\[$device:$1(\]|:.+\]|,.+\])/); if ($found) { return 1; } @@ -1480,8 +1480,8 @@ DOIF_TimerTrigger ($) } $ret=DOIF_Trigger ($hash,"") if (ReadingsVal($pn,"mode","") ne "disabled"); for (my $j=0; $j<$hash->{helper}{last_timer};$j++) { + $hash->{timer}{$j}=0; if ($hash->{localtime}{$j} == $localtime) { - $hash->{timer}{$j}=0; if (!AttrVal($hash->{NAME},"disable","")) { if (defined ($hash->{interval}{$j})) { if ($hash->{interval}{$j} != -1) {