summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-02-09 15:27:39 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2002-02-09 15:27:39 +0100
commit13a0aff6b9313b0fced68f4a91a8fd59fceddd06 (patch)
tree217918142c0cb298f1619b8f918598d09be94507
parentaa80fad981a84e5c4742e1adf3a1691fb9f23218 (diff)
downloadvdr-13a0aff6b9313b0fced68f4a91a8fd59fceddd06.tar.gz
vdr-13a0aff6b9313b0fced68f4a91a8fd59fceddd06.tar.bz2
Reverted to the previous way of searching for the EPG record of the current recording in case of a periodic timer
-rw-r--r--HISTORY3
-rw-r--r--menu.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 7abead38..8a2b861f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -978,3 +978,6 @@ Video Disk Recorder Revision History
to 25.75 MB/min.
- Only reporting the 'EPG bugfix statistics' if there really were any fixes.
- Added Finnish language texts (thanks to Hannu Savolainen).
+- Reverted to the previous way of searching for the EPG record of the current
+ recording in case of a periodic timer (i.e. taking the one that is in the
+ middle between start and end time).
diff --git a/menu.c b/menu.c
index 0c480074..59ce2aa6 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.149 2002/02/09 14:42:56 kls Exp $
+ * $Id: menu.c 1.150 2002/02/09 15:25:27 kls Exp $
*/
#include "menu.h"
@@ -2341,7 +2341,7 @@ cRecordControl::~cRecordControl()
bool cRecordControl::GetEventInfo(void)
{
cChannel *channel = Channels.GetByNumber(timer->channel);
- time_t Time = timer->StartTime() + ((Setup.MarginStart * 2) + 1) * 60;
+ time_t Time = timer->IsSingleEvent() ? timer->StartTime() + ((Setup.MarginStart * 2) + 1) * 60 : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
{
cThreadLock ThreadLock;