Implemented automatic PID switching and channel detection

1 files changed, 5 insertions, 3 deletions

diff --git a/timers.c b/timers.c
index 36e249c3..1db88a0f 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.7 2003/12/13 13:06:29 kls Exp $
+ * $Id: timers.c 1.8 2003/12/27 13:10:04 kls Exp $
  */
 
 #include "timers.h"
@@ -216,8 +216,10 @@ bool cTimer::Parse(const char *s)
      strn0cpy(file, filebuffer, MaxFileName);
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
-     tChannelID cid = tChannelID::FromString(channelbuffer);
-     channel = cid.Valid() ? Channels.GetByChannelID(cid, true) : Channels.GetByNumber(atoi(channelbuffer));
+     if (isnumber(channelbuffer))
+        channel = Channels.GetByNumber(atoi(channelbuffer));
+     else
+        channel = Channels.GetByChannelID(tChannelID::FromString(channelbuffer), true);
      if (!channel) {
         esyslog("ERROR: channel %s not defined", channelbuffer);
         result = false;