frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

No longer stopping Transfer Mode or replay immediately when the Power button is pressed

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-05-26 10:33:17 +02:00
parent 425daa4ca5
commit a05b921e29
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -876,6 +876,7 @@ Niko Tarnanen <niko.tarnanen@hut.fi>
Rolf Ahrenberg <rahrenbe@cc.hut.fi> Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for translating OSD texts to the Finnish language for translating OSD texts to the Finnish language
for fixing internationalization of the text for "Setup/DVB/Audio language(s)" for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
for making pressing the Power button not stop Transfer Mode or replay immediately
Ralf Klueber <ralf.klueber@vodafone.com> Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark for reporting a bug in cutting a recording if there is only a single editing mark

2
HISTORY
View File

@ -3559,3 +3559,5 @@ Video Disk Recorder Revision History
session (thanks to Mirko Dölle). session (thanks to Mirko Dölle).
- Now dropping EPG events that have a zero start time or duration (thanks to - Now dropping EPG events that have a zero start time or duration (thanks to
Oliver Endriss). Oliver Endriss).
- No longer stopping Transfer Mode or replay immediately when the Power button
is pressed (thanks to Rolf Ahrenberg).

4
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.205 2005/05/26 10:04:58 kls Exp $ * $Id: vdr.c 1.206 2005/05/26 10:30:18 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -744,7 +744,6 @@ int main(int argc, char *argv[])
// Power off: // Power off:
case kPower: isyslog("Power button pressed"); case kPower: isyslog("Power button pressed");
DELETENULL(Menu); DELETENULL(Menu);
cControl::Shutdown();
Temp = NULL; Temp = NULL;
if (!Shutdown) { if (!Shutdown) {
Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!")); Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
@ -906,6 +905,7 @@ int main(int argc, char *argv[])
if (WatchdogTimeout > 0) if (WatchdogTimeout > 0)
signal(SIGALRM, SIG_IGN); signal(SIGALRM, SIG_IGN);
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)) {
cControl::Shutdown();
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 Delta = Next - time(NULL); // compensates for Confirm() timeout