Fixed reading 'epg.data' for channels with non-zero RID

3 files changed, 5 insertions, 1 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b2cd6a81..bc0da0bd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -470,6 +470,7 @@ Oliver Endriss <o.endriss@gmx.de>
  PIDs
  for reporting a problem with cPlugin::Start() being called after trying to learn
  the remote control keys
+ for reporting a bug in reading 'epg.data' for channels with non-zero RID
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
diff --git a/HISTORY b/HISTORY
index f15ad717..c3ad7913 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2166,3 +2166,5 @@ Video Disk Recorder Revision History
 - Fixed setting the locking pid after a timed wait (thanks to Andreas Schultz).
 - Avoiding spurious section filter settings after a channel switch.
 - Updated 'channels.conf.cable' (thanks to Stefan Hußfeldt).
+- Fixed reading 'epg.data' for channels with non-zero RID (thanks to Oliver
+  Endriss for reporting this one).
diff --git a/eit.c b/eit.c
index 22fcf8aa..d1680992 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.76 2003/05/18 12:51:50 kls Exp $
+ * $Id: eit.c 1.77 2003/05/18 13:13:31 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -807,6 +807,7 @@ cSchedules::~cSchedules()
 /**  */
 const cSchedule *cSchedules::AddChannelID(tChannelID channelid)
 {
+  channelid.ClrRid();
   const cSchedule *p = GetSchedule(channelid);
   if (!p) {
      Add(new cSchedule(channelid));