diff options
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | config.c | 6 | ||||
| -rw-r--r-- | config.h | 4 | ||||
| -rw-r--r-- | menu.c | 6 |
5 files changed, 12 insertions, 9 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index cbd0284a..837d502a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -215,9 +215,10 @@ Uwe Freese <mail@uwe-freese.de> for suggesting to automatically close an empty recordings page after deleting an entry -Rainer Zocholl <Usenet-372114@zocki.toppoint.de> +Rainer Zocholl <Usenet-372203@zocki.toppoint.de> for suggesting a confirmation prompt when the user presses the "Power" button and there is an upcoming timer event + for reporting a bug in skipping the next hit of a repeating timer Oleg Assovski <assen@bitcom.msk.ru> for adding EPG scanning for another 4 days @@ -1157,3 +1157,5 @@ Video Disk Recorder Revision History up from right to left. - Now using statfs() to determine the amount of free disk space, which avoids the use of an external 'df' command (thanks to Ruben Nunez Francisco). +- Fixed skipping the next hit of a repeating timer (thanks to Rainer Zocholl + for reporting this one). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 1.93 2002/03/31 11:57:07 kls Exp $ + * $Id: config.c 1.94 2002/03/31 21:17:24 kls Exp $ */ #include "config.h" @@ -638,9 +638,9 @@ void cTimer::SetPending(bool Pending) pending = Pending; } -void cTimer::SkipToday(void) +void cTimer::Skip(void) { - firstday = IncDay(SetTime(recording ? StartTime() : time(NULL), 0), 1); + firstday = IncDay(SetTime(StartTime(), 0), 1); } // --- cCommand ------------------------------------------------------------- @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.106 2002/03/24 14:31:07 kls Exp $ + * $Id: config.h 1.107 2002/03/31 21:17:30 kls Exp $ */ #ifndef __CONFIG_H @@ -165,7 +165,7 @@ public: time_t StopTime(void); void SetRecording(bool Recording); void SetPending(bool Pending); - void SkipToday(void); + void Skip(void); const char *PrintFirstDay(void); static int TimeToInt(int t); static int ParseDay(const char *s, time_t *FirstDay = NULL); @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.179 2002/03/31 15:20:47 kls Exp $ + * $Id: menu.c 1.180 2002/03/31 21:17:42 kls Exp $ */ #include "menu.h" @@ -1219,7 +1219,7 @@ eOSState cMenuTimers::OnOff(void) timer->active = false; } else if (timer->active) - timer->SkipToday(); + timer->Skip(); else timer->active = true; timer->Matches(); // refresh start and end time @@ -1856,7 +1856,7 @@ eOSState cMenuRecordings::Del(void) if (Interface->Confirm(tr("Timer still recording - really delete?"))) { cTimer *timer = rc->Timer(); if (timer) { - timer->SkipToday(); + timer->Skip(); cRecordControls::Process(time(NULL)); Timers.Save(); } |