Fixed handling a channels.conf that contains a ":@nnn" line as its last entry

3 files changed, 8 insertions, 3 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e76da0fd..501ebcde 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -728,6 +728,8 @@ Niko Tarnanen <niko.tarnanen@hut.fi> and Rolf Ahrenberg <rahrenbe@cc.hut.fi>
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
+ for reporting a bug in handling a channels.conf that contains a ":@nnn" line as
+ its last entry
 
 Hermann Gausterer <mrq1@gmx.net>
  for suggesting to switch to the recording channel in case the current channel
diff --git a/HISTORY b/HISTORY
index fc396678..99c88092 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2409,3 +2409,5 @@ Video Disk Recorder Revision History
   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).
diff --git a/channels.c b/channels.c
index 6ff71888..69a5faef 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.14 2003/09/09 18:55:26 kls Exp $
+ * $Id: channels.c 1.15 2003/10/03 15:12:59 kls Exp $
  */
 
 #include "channels.h"
@@ -431,10 +431,11 @@ void cChannels::ReNumber( void )
          if (channel->Number() > Number)
             Number = channel->Number();
          }
-      else
+      else {
+         maxNumber = Number;
          channel->SetNumber(Number++);
+         }
       }
-  maxNumber = Number - 1;
 }
 
 cChannel *cChannels::GetByNumber(int Number, int SkipGap)