diff --git a/HISTORY b/HISTORY index 7dd34581..42e3ffd9 100644 --- a/HISTORY +++ b/HISTORY @@ -1072,3 +1072,4 @@ Video Disk Recorder Revision History - Added 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf' (thanks to Bernd Schweikert). - Fixed avoiding the primary DVB interface in case Setup.PrimaryLimit is 0. +- Fixed handling CICAM settings if the first one of a DVB card was FTA. diff --git a/config.c b/config.c index a91cb8ac..ad22d95c 100644 --- a/config.c +++ b/config.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 1.88 2002/03/03 16:04:21 kls Exp $ + * $Id: config.c 1.89 2002/03/08 14:57:08 kls Exp $ */ #include "config.h" @@ -962,12 +962,16 @@ cSetup::cSetup(void) void cSetup::PrintCaCaps(FILE *f, const char *Name) { for (int d = 0; d < MAXDVBAPI; d++) { - if (CaCaps[d][0]) { - fprintf(f, "CaCaps = %d", d + 1); - for (int i = 0; i < MAXCACAPS && CaCaps[d][i]; i++) + int written = 0; + for (int i = 0; i < MAXCACAPS; i++) { + if (CaCaps[d][i]) { + if (!written++) + fprintf(f, "CaCaps = %d", d + 1); fprintf(f, " %d", CaCaps[d][i]); + } + } + if (written) fprintf(f, "\n"); - } } } diff --git a/dvbapi.c b/dvbapi.c index f5adda98..16e8ab8a 100644 --- a/dvbapi.c +++ b/dvbapi.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbapi.c 1.155 2002/03/08 14:23:29 kls Exp $ + * $Id: dvbapi.c 1.156 2002/03/08 15:06:37 kls Exp $ */ #include "dvbapi.h" @@ -1870,8 +1870,6 @@ int cDvbApi::ProvidesCa(int Ca) else others++; } - else - break; } return result ? result + others : 0; }