From 967ec9f2d47ea61c004f6840e2620ca122a4dd24 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 2 Apr 2002 20:59:05 +0200 Subject: [PATCH] Fixed a problem with wrong EPG data in the Schedules menu --- CONTRIBUTORS | 3 +++ HISTORY | 5 +++++ config.h | 4 ++-- menu.c | 8 +++++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 1cebb3b0..e7315327 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -259,3 +259,6 @@ Mirko D Michael Rakowski for translating OSD texts to the Polish language + +Tobias Kerner + for helping to debug a problem with wrong EPG data in the Schedules menu diff --git a/HISTORY b/HISTORY index 30b2c0af..6e92508d 100644 --- a/HISTORY +++ b/HISTORY @@ -1170,3 +1170,8 @@ Video Disk Recorder Revision History the F-keys on top. - Fixed a bug in the EPG bugfix mechanism if the extended description is shorter than 3 characters (thanks to Andreas Schultz). + +2002-04-02: Version 1.0.0pre6 + +- Fixed a problem with wrong EPG data in the Schedules menu (thanks to Tobias + Kerner). diff --git a/config.h b/config.h index e7c01eb2..2d6450d6 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.107 2002/03/31 21:17:30 kls Exp $ + * $Id: config.h 1.108 2002/04/02 20:59:05 kls Exp $ */ #ifndef __CONFIG_H @@ -19,7 +19,7 @@ #include "eit.h" #include "tools.h" -#define VDRVERSION "1.0.0pre5" +#define VDRVERSION "1.0.0pre6" #define MAXPRIORITY 99 #define MAXLIFETIME 99 diff --git a/menu.c b/menu.c index 03dbcea3..f474b4e9 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.180 2002/03/31 21:17:42 kls Exp $ + * $Id: menu.c 1.181 2002/04/02 20:53:52 kls Exp $ */ #include "menu.h" @@ -1539,6 +1539,7 @@ private: void PrepareSchedule(cChannel *Channel); public: cMenuSchedule(void); + virtual ~cMenuSchedule(); virtual eOSState ProcessKey(eKeys Key); }; @@ -1556,6 +1557,11 @@ cMenuSchedule::cMenuSchedule(void) } } +cMenuSchedule::~cMenuSchedule() +{ + cMenuWhatsOn::ScheduleEventInfo(); // makes sure any posted data is cleared +} + static int CompareEventTime(const void *p1, const void *p2) { return (int)((*(cEventInfo **)p1)->GetTime() - (*(cEventInfo **)p2)->GetTime());