diff --git a/FHEM/91_watchdog.pm b/FHEM/91_watchdog.pm
index bf9cf70c8..18c4df6de 100755
--- a/FHEM/91_watchdog.pm
+++ b/FHEM/91_watchdog.pm
@@ -94,6 +94,12 @@ watchdog_Notify($$)
if($watchdog->{STATE} =~ m/Next:/) {
+ if($dotTrigger) {
+ RemoveInternalTimer($watchdog);
+ $watchdog->{STATE} = "defined";
+ return;
+ }
+
if($n =~ m/^$re2$/ || "$n:$s" =~ m/^$re2$/) {
RemoveInternalTimer($watchdog);
@@ -112,8 +118,7 @@ watchdog_Notify($$)
}
} elsif($watchdog->{STATE} eq "defined") {
- if($dotTrigger || # trigger w .
- ($n =~ m/^$re1$/ || "$n:$s" =~ m/^$re1$/)) {
+ if($dotTrigger || ($n =~ m/^$re1$/ || "$n:$s" =~ m/^$re1$/)) {
watchdog_Activate($watchdog)
}
@@ -251,9 +256,10 @@ watchdog_Attr(@)
regexp, and it will be reactivated, when it is received.
trigger <watchdogname> . will activate the trigger if its state
- is defined, and set it into state defined if its state is
- triggered. You always have to reactivate the watchdog with this
- command once it has triggered (unless you restart fhem)
+ is defined, and set it into state defined if its state is active
+ (Next:...) or triggered. You always have to reactivate the watchdog
+ with this command once it has triggered (unless you restart
+ fhem)
a generic watchdog (one watchdog responsible for more devices) is
currently not possible.
with modify all parameters are optional, and will not be changed if
@@ -354,7 +360,7 @@ watchdog_Attr(@)
trigger <watchdogname> . aktiviert den Trigger wenn dessen
Status defined ist und setzt ihn in den Status defined wenn sein status
- triggered ist.
+ triggered oder aktiviert (Next:...) ist.
Der Watchdog musst immer mit diesem Befehl reaktiviert werden wenn er
getriggert wurde.