frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoiding shutdown message "Recording in ... minutes, shut down anyway?" with a negative number of minutes

This commit is contained in:
Klaus Schmidinger 2006-08-05 10:55:52 +02:00
parent 8bfe599830
commit 394865b3d9
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -1457,6 +1457,8 @@ Udo Richter <udo_richter@gmx.de>
plugins plugins
for reporting a missing '--vfat' in the vdr.1 man page for reporting a missing '--vfat' in the vdr.1 man page
for fixing deleting the last character of a string menu item in insert mode for fixing deleting the last character of a string menu item in insert mode
for reporting that the shutdown message "Recording in ... minutes, shut down anyway?"
may have been given with a negative number of minutes
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

2
HISTORY
View File

@ -4854,3 +4854,5 @@ Video Disk Recorder Revision History
event timeout" setup parameter), and the user insists in shutting down now, the event timeout" setup parameter), and the user insists in shutting down now, the
reboot time given to the shutdown script will correspond to a time that is reboot time given to the shutdown script will correspond to a time that is
"Min. event timeout" minutes (default is 30) in the future. "Min. event timeout" minutes (default is 30) in the future.
- Avoiding shutdown message "Recording in ... minutes, shut down anyway?" with
a negative number of minutes (reported by Udo Richter).

24
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.277 2006/08/05 10:40:57 kls Exp $ * $Id: vdr.c 1.278 2006/08/05 10:46:38 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -1015,16 +1015,18 @@ int main(int argc, char *argv[])
} }
if (cPluginManager::Active(tr("shut down anyway?"))) if (cPluginManager::Active(tr("shut down anyway?")))
break; break;
cTimer *timer = Timers.GetNextActiveTimer(); if (!cRecordControls::Active()) {
time_t Next = timer ? timer->StartTime() : 0; cTimer *timer = Timers.GetNextActiveTimer();
time_t Delta = timer ? Next - time(NULL) : 0; time_t Next = timer ? timer->StartTime() : 0;
if (Next && Delta <= Setup.MinEventTimeout * 60) { time_t Delta = timer ? Next - time(NULL) : 0;
char *buf; if (Next && Delta <= Setup.MinEventTimeout * 60) {
asprintf(&buf, tr("Recording in %ld minutes, shut down anyway?"), Delta / 60); char *buf;
bool confirm = Interface->Confirm(buf); asprintf(&buf, tr("Recording in %ld minutes, shut down anyway?"), Delta / 60);
free(buf); bool confirm = Interface->Confirm(buf);
if (!confirm) free(buf);
break; if (!confirm)
break;
}
} }
ForceShutdown = true; ForceShutdown = true;
break; break;