diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 38084be7..8fd4ebda 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -178,3 +178,6 @@ Lauri Pesonen Emil Naepflein for his hint about the 'ftw()' library function + +Sergei Haller + for fixing the LastActivity timestamp after a shutdown prompt diff --git a/HISTORY b/HISTORY index 9b782e6a..36d25f66 100644 --- a/HISTORY +++ b/HISTORY @@ -911,3 +911,5 @@ Video Disk Recorder Revision History deleted if an error occured. - A message is now prompted at the end of the editing process, indicating whether the process succeeded or failed. +- Fixed setting the LastActivity timestamp after a shutdown prompt (thanks to + Sergei Haller). diff --git a/vdr.c b/vdr.c index 17d84094..5351e409 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/people/kls/vdr * - * $Id: vdr.c 1.92 2002/01/26 13:35:05 kls Exp $ + * $Id: vdr.c 1.93 2002/01/26 14:07:01 kls Exp $ */ #include @@ -514,7 +514,7 @@ int main(int argc, char *argv[]) if (signal(SIGALRM, Watchdog) == SIG_IGN) signal(SIGALRM, SIG_IGN); } - LastActivity = Now; // don't try again too soon + LastActivity = time(NULL); // don't try again too soon continue; // skip the rest of the housekeeping for now } }