From 7d3f63a402dcdff41a8180784109c17cb2b98333 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 16 Jan 2004 14:01:48 +0100 Subject: [PATCH] Fixed a wrong 'delta' value in the call to the shutdown script --- CONTRIBUTORS | 3 +++ HISTORY | 2 ++ vdr.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index fbfb6387..8d80ae69 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -907,3 +907,6 @@ Robert Huitl Vyacheslav Dikonov for translating OSD texts to the Russian language + +Stephan Epstein + for reporting a wrong 'delta' value in the call to the shutdown script diff --git a/HISTORY b/HISTORY index b53b746a..7e37d87c 100644 --- a/HISTORY +++ b/HISTORY @@ -2584,3 +2584,5 @@ Video Disk Recorder Revision History your texts. - Some corrections and additions to the Finnish OSD texts (thanks to Rolf Ahrenberg and Niko Tarnanen). +- Fixed a wrong 'delta' value in the call to the shutdown script (thanks to + Stephan Epstein for reporting this one). diff --git a/vdr.c b/vdr.c index fc12f005..e8987398 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.172 2004/01/04 11:12:05 kls Exp $ + * $Id: vdr.c 1.173 2004/01/16 13:59:57 kls Exp $ */ #include @@ -795,6 +795,7 @@ int main(int argc, char *argv[]) if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) { int Channel = timer ? timer->Channel()->Number() : 0; const char *File = timer ? timer->File() : ""; + Delta = Next - time(NULL); // compensates for Confirm() timeout char *cmd; asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, strescape(File, "\"$"), UserShutdown); isyslog("executing '%s'", cmd);