1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed a wrong 'delta' value in the call to the shutdown script

This commit is contained in:
Klaus Schmidinger 2004-01-16 14:01:48 +01:00
parent 00e08f5821
commit 7d3f63a402
3 changed files with 7 additions and 1 deletions

View File

@ -907,3 +907,6 @@ Robert Huitl <vdr@huitl.de>
Vyacheslav Dikonov <sdiconov@mail.ru> Vyacheslav Dikonov <sdiconov@mail.ru>
for translating OSD texts to the Russian language 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

View File

@ -2584,3 +2584,5 @@ Video Disk Recorder Revision History
your texts. your texts.
- Some corrections and additions to the Finnish OSD texts (thanks to Rolf - Some corrections and additions to the Finnish OSD texts (thanks to Rolf
Ahrenberg and Niko Tarnanen). Ahrenberg and Niko Tarnanen).
- Fixed a wrong 'delta' value in the call to the shutdown script (thanks to
Stephan Epstein for reporting this one).

3
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * 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> #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)) { if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
int Channel = timer ? timer->Channel()->Number() : 0; int Channel = timer ? timer->Channel()->Number() : 0;
const char *File = timer ? timer->File() : ""; const char *File = timer ? timer->File() : "";
Delta = Next - time(NULL); // compensates for Confirm() timeout
char *cmd; char *cmd;
asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, strescape(File, "\"$"), UserShutdown); asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, strescape(File, "\"$"), UserShutdown);
isyslog("executing '%s'", cmd); isyslog("executing '%s'", cmd);