diff options
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | vdr.c | 17 |
3 files changed, 14 insertions, 7 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 1ea79eec..2888445e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1776,3 +1776,6 @@ Christoph Haubrich <christoph1.haubrich@arcor.de> Pekka Mauno <pekka.mauno@iki.fi> for fixing cSchedule::GetFollowingEvent() in case there is currently no present event running + +Alexander Wenzel <hondansx@gmx.de> + for fixing the shutdown timeout @@ -4429,3 +4429,4 @@ Video Disk Recorder Revision History - Fixed cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is false (thanks to Werner Fink). - Updated 'sources.conf'. +- Fixed the shutdown timeout (thanks to Alexander Wenzel). @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.249 2006/02/05 12:57:10 kls Exp $ + * $Id: vdr.c 1.250 2006/03/19 13:29:49 kls Exp $ */ #include <getopt.h> @@ -1090,13 +1090,16 @@ int main(int argc, char *argv[]) isyslog("executing '%s'", cmd); SystemExec(cmd); free(cmd); + LastActivity = time(NULL) - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later } - 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 + 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 } |