From b7d3b1d525c29fdb364cfded9d8d71683afa0788 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Sat, 15 Nov 2008 09:28:22 +0000
Subject: [PATCH] Watchdog crash fixed

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

diff --git a/fhem/FHEM/91_watchdog.pm b/fhem/FHEM/91_watchdog.pm
index 1c97a86b3..fd2d6e1ac 100755
--- a/fhem/FHEM/91_watchdog.pm
+++ b/fhem/FHEM/91_watchdog.pm
@@ -101,6 +101,7 @@ watchdog_Activate($)
   my ($ntfy) = @_;
   my $nt = gettimeofday() + $ntfy->{TO};
   $ntfy->{STATE} = "Next: " . FmtTime($nt);
+  RemoveInternalTimer($ntfy);
   InternalTimer($nt, "watchdog_Trigger", $ntfy, 0)
 }
 
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index c4c29c53b..bd18b1c20 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -145,7 +145,7 @@ my $nextat;                     # Time when next timer will be triggered.
 my $intAtCnt=0;
 my $reread_active = 0;
 my $AttrList = "room comment";
-my $cvsid = '$Id: fhem.pl,v 1.56 2008-11-01 21:27:10 neubert Exp $';
+my $cvsid = '$Id: fhem.pl,v 1.57 2008-11-15 09:28:22 rudolfkoenig Exp $';
 my $namedef =
   "where <name> is either:\n" .
   "- a single device name\n" .
@@ -1632,9 +1632,13 @@ HandleTimeout()
   # Check the internal list.
   foreach my $i (keys %intAt) {
     my $tim = $intAt{$i}{TRIGGERTIME};
-    if($tim <= $now) {
+    my $fn = $intAt{$i}{FN};
+    if(!defined($tim) || !defined($fn)) {
+      delete($intAt{$i});
+      next;
+    } elsif($tim <= $now) {
       no strict "refs";
-      &{$intAt{$i}{FN}}($intAt{$i}{ARG});
+      &{$fn}($intAt{$i}{ARG});
       use strict "refs";
       delete($intAt{$i});
     }
@@ -1856,11 +1860,9 @@ DoTrigger($$)
     my $ret = "";
     foreach my $n (sort keys %defs) {
       if(defined($modules{$defs{$n}{TYPE}})) {
-        if(defined($modules{$defs{$n}{TYPE}}{NotifyFn})) {
-          if($modules{$defs{$n}{TYPE}}{NotifyFn}) {
-            Log 5, "$dev trigger: Checking $n for notify";
-            $ret .= CallFn($n, "NotifyFn", $defs{$n}, $defs{$dev});
-          }
+        if($modules{$defs{$n}{TYPE}}{NotifyFn}) {
+          Log 5, "$dev trigger: Checking $n for notify";
+          $ret .= CallFn($n, "NotifyFn", $defs{$n}, $defs{$dev});
         }
       }
     }