frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Klaus Schmidinger 2003-10-03 15:16:08 +02:00
parent 4eecc59ef8
commit 944ffee0a1
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -728,6 +728,8 @@ Niko Tarnanen <niko.tarnanen@hut.fi> and Rolf Ahrenberg <rahrenbe@cc.hut.fi>
Ralf Klueber <ralf.klueber@vodafone.com> 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 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> Hermann Gausterer <mrq1@gmx.net>
for suggesting to switch to the recording channel in case the current channel for suggesting to switch to the recording channel in case the current channel

2
HISTORY
View File

@ -2409,3 +2409,5 @@ Video Disk Recorder Revision History
reporting this one). reporting this one).
- Fixed missing channel info after an incomplete channel group switch (thanks - Fixed missing channel info after an incomplete channel group switch (thanks
to Andreas Trauer). to Andreas Trauer).
- Fixed handling a channels.conf that contains a ":@nnn" line as its last entry
(thanks to Ralf Klueber).

7
channels.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "channels.h"
@ -431,10 +431,11 @@ void cChannels::ReNumber( void )
if (channel->Number() > Number) if (channel->Number() > Number)
Number = channel->Number(); Number = channel->Number();
} }
else else {
maxNumber = Number;
channel->SetNumber(Number++); channel->SetNumber(Number++);
}
} }
maxNumber = Number - 1;
} }
cChannel *cChannels::GetByNumber(int Number, int SkipGap) cChannel *cChannels::GetByNumber(int Number, int SkipGap)