summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-01-16 14:01:48 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2004-01-16 14:01:48 +0100
commit7d3f63a402dcdff41a8180784109c17cb2b98333 (patch)
tree6468bd69d9230e6a1e90a0a66a42835f814859a3
parent00e08f582135e4ba2c264626369458e4d0f4b3b3 (diff)
downloadvdr-7d3f63a402dcdff41a8180784109c17cb2b98333.tar.gz
vdr-7d3f63a402dcdff41a8180784109c17cb2b98333.tar.bz2
Fixed a wrong 'delta' value in the call to the shutdown script
-rw-r--r--CONTRIBUTORS3
-rw-r--r--HISTORY2
-rw-r--r--vdr.c3
3 files changed, 7 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fbfb6387..8d80ae69 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -907,3 +907,6 @@ Robert Huitl <vdr@huitl.de>
Vyacheslav Dikonov <sdiconov@mail.ru>
for translating OSD texts to the Russian language
+
+Stephan Epstein <s.epstein@vinzenz.com>
+ 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 <getopt.h>
@@ -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);