From 162ed534b0cb1ffc481ac5a1b7eb4a2e3418aa4b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 17 Oct 2003 18:00:00 +0200
Subject: Version 1.2.6pre1 - Updated the required driver version in INSTALL
 (thanks to Jens Groth for   reporting this one). - Fixed missing channel info
 after an incomplete channel group switch (thanks   to Andreas Trauer). -
 Fixed handling a channels.conf that contains a ":@nnn" line as its last entry
   (thanks to Ralf Klueber). - Fixed detecting the /dev/videoN devices for
 GRAB in case there are others   before the DVB devices (thanks to Andreas
 Kool). - Updated 'channels.conf.terr' for Berlin (thanks to Markus Hardt). -
 Fixed handling rc key learning in case cRemote::Initialize() returns 'false' 
  (thanks to Oliver Endriss). - Fixed initializing the highlight area in
 cDvbSpuDecoder (thanks to Sven Goethel). - Now trying to get a timer's
 channel without RID when loading 'timers.conf'   (thanks to Thomas Rausch). -
 Removed the unused 0x73 (TOT) filter in eit.c (thanks to Andreas Trauer). -
 Fixed extracting the ES data in cDvbDevice::StillPicture() (thanks to Stefan 
  Huelswitt). - Added MPEG1 handling to cDvbDevice::StillPicture() (thanks to
 Thomas   Heiligenmann). - Changed the default "Lifetime" to 99, which means
 that recordings will   never be deleted automatically in case the disk runs
 full (suggested by   Oliver Endriss). Note that in an existing VDR
 installation the current   value as set in 'setup.conf' will still be used -
 this change only affects   new VDR installations. - Edited recordings will
 now never be deleted automatically if the disk runs   full (suggested by Emil
 Naepflein). - Channel IDs are now checked when reading 'channels.conf' to
 avoid later   problems with timers.

---
 timers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'timers.c')

diff --git a/timers.c b/timers.c
index 1542942..a4ab3c1 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.5 2003/05/11 13:48:49 kls Exp $
+ * $Id: timers.c 1.6 2003/10/12 10:33:09 kls Exp $
  */
 
 #include "timers.h"
@@ -217,7 +217,7 @@ bool cTimer::Parse(const char *s)
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
      tChannelID cid = tChannelID::FromString(channelbuffer);
-     channel = cid.Valid() ? Channels.GetByChannelID(cid) : Channels.GetByNumber(atoi(channelbuffer));
+     channel = cid.Valid() ? Channels.GetByChannelID(cid, true) : Channels.GetByNumber(atoi(channelbuffer));
      if (!channel) {
         esyslog("ERROR: channel %s not defined", channelbuffer);
         result = false;
-- 
cgit v1.2.3