--- vdr-1.3.43/vdr.c	2006-02-05 13:57:10.000000000 +0100
+++ vdr-1.3.43-1/vdr.c	2006-02-19 17:30:47.000000000 +0100
@@ -1090,13 +1090,16 @@
                        isyslog("executing '%s'", cmd);
                        SystemExec(cmd);
                        free(cmd);
-                       }
-                    else if (WatchdogTimeout > 0) {
-                       alarm(WatchdogTimeout);
-                       if (signal(SIGALRM, Watchdog) == SIG_IGN)
-                          signal(SIGALRM, SIG_IGN);
-                       }
-                    LastActivity = time(NULL) - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
+                       LastActivity = time(NULL) - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
+		       }
+                    else {
+		       LastActivity = Now;
+		       if (WatchdogTimeout > 0) {
+                       		alarm(WatchdogTimeout);
+                       		if (signal(SIGALRM, Watchdog) == SIG_IGN)
+                          	signal(SIGALRM, SIG_IGN);
+                       		}
+		    }
                     UserShutdown = false;
                     continue; // skip the rest of the housekeeping for now
                     }