Timers now accept channel IDs even if the 'source' is 0

3 files changed, 5 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index edca3a44..39ec9b79 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -160,6 +160,7 @@ Stefan Huelswitt <huels@iname.com>
  for helping to fix switching audio tracks in 'Transfer Mode' on the primary DVB device
  for fixing handling 'Transfer Mode' on single device systems when recording an
  encrypted channel
+ for reporting a problem with timers when channel IDs have a 'source' that is 0
 
 Ulrich Röder <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
diff --git a/HISTORY b/HISTORY
index 98534bc7..d09cbd02 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1827,3 +1827,5 @@ Video Disk Recorder Revision History
 - Removed transponders 10788, 11739 and 12266 from 'channels.conf' (apparently they
   are no longer active).
 - Deactivated some templates in tools.h in case some plugin needs to use the STL.
+- Timers now accept channel IDs even if the 'source' is 0 (thanks to Stefan Huelswitt
+  for reporting this one).
diff --git a/channels.h b/channels.h
index 0f6feb10..b21ed307 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.5 2002/11/24 14:27:51 kls Exp $
+ * $Id: channels.h 1.6 2002/11/30 12:59:05 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -46,7 +46,7 @@ public:
   tChannelID(void) { source = nid = tid = sid = rid = 0; }
   tChannelID(int Source, int Nid, int Tid, int Sid, int Rid = 0) { source = Source; nid = Nid; tid = Tid; sid = Sid; rid = Rid; }
   bool operator== (const tChannelID &arg) const;
-  bool Valid(void) { return source && tid && sid; } // nid and rid are optional
+  bool Valid(void) { return tid && sid; } // nid and rid are optional and source may be 0
   tChannelID &ClrRid(void) { rid = 0; return *this; }
   static tChannelID FromString(const char *s);
   const char *ToString(void);