From 57239b827177de72b317191f624238caa19d78fa Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 12 Oct 2003 10:35:22 +0200 Subject: [PATCH] Now trying to get a timer's channel without RID when loading 'timers.conf' --- CONTRIBUTORS | 3 +++ HISTORY | 2 ++ timers.c | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5c21c047..a8105301 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -836,3 +836,6 @@ Andreas Trauer Markus Hardt for his help in keeping 'channels.conf.terr' up to date + +Thomas Rausch + for making VDR try to get a timer's channel without RID when loading 'timers.conf' diff --git a/HISTORY b/HISTORY index cb63fd33..9e3603c2 100644 --- a/HISTORY +++ b/HISTORY @@ -2417,3 +2417,5 @@ Video Disk Recorder Revision History - 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). diff --git a/timers.c b/timers.c index 15429427..a4ab3c16 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;