mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed setting the 'Delta' parameter when calling the shutdown script with no active timer
This commit is contained in:
parent
4ba450b737
commit
b49df33917
@ -1830,3 +1830,7 @@ Tobias Grimm <listaccount@e-tobi.net>
|
||||
|
||||
Peter Dittmann <peter.dittmann@philips.com>
|
||||
for a patch that was used as a base to implement cPlugin::Active()
|
||||
|
||||
Helge Lenz <h.lenz@gmx.de>
|
||||
for reporting a bug in setting the 'Delta' parameter when calling the shutdown
|
||||
script with no active timer
|
||||
|
2
HISTORY
2
HISTORY
@ -4526,3 +4526,5 @@ Video Disk Recorder Revision History
|
||||
- The new function cPlugin::Active() can be used by a plugin to indicate that it
|
||||
is still busy and the system should not shut down or restart (based on a patch
|
||||
from Peter Dittmann). See PLUGINS.html for details.
|
||||
- Fixed setting the 'Delta' parameter when calling the shutdown script with
|
||||
no active timer (reported by Helge Lenz).
|
||||
|
5
vdr.c
5
vdr.c
@ -22,7 +22,7 @@
|
||||
*
|
||||
* The project's page is at http://www.cadsoft.de/vdr
|
||||
*
|
||||
* $Id: vdr.c 1.257 2006/04/15 11:05:49 kls Exp $
|
||||
* $Id: vdr.c 1.258 2006/04/15 11:29:13 kls Exp $
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
@ -1132,7 +1132,8 @@ int main(int argc, char *argv[])
|
||||
cControl::Shutdown();
|
||||
int Channel = timer ? timer->Channel()->Number() : 0;
|
||||
const char *File = timer ? timer->File() : "";
|
||||
Delta = Next - time(NULL); // compensates for Confirm() timeout
|
||||
if (timer)
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user