From 25dfba5b21e005fe53bd693e56cda2d6db956361 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Wed, 10 Feb 2016 18:24:20 +0000
Subject: [PATCH] 91_watchdog.pm: trigger w . will abort an activated trigger
 (Forum #43957)

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@10789 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/91_watchdog.pm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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.
           </li>
       <li>trigger &lt;watchdogname&gt; . 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)</li>
+          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)</li>
       <li>a generic watchdog (one watchdog responsible for more devices) is
           currently not possible.</li>
       <li>with modify all parameters are optional, and will not be changed if
@@ -354,7 +360,7 @@ watchdog_Attr(@)
 
       <li>trigger &lt;watchdogname&gt; . aktiviert den Trigger wenn dessen
       Status defined ist und setzt ihn in den Status defined wenn sein status
-      triggered ist.<br>
+      triggered oder aktiviert (Next:...) ist.<br>
 
       Der Watchdog musst immer mit diesem Befehl reaktiviert werden wenn er
       getriggert wurde.</li>