diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | menu.c | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5dc27101..c8e6b3eb 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -371,6 +371,8 @@ Gerald Raaf <graaf@attglobal.net> for helping to fix the still picture workaround in case the progress display is active for his support in keeping the Premiere World channels up to date in 'channels.conf' + for reporting a problem in device handling in the CICAM menu in case a VDR + instance was started with a specific device using the -D option Andreas Roedl <flood@flood-net.de> for adding some DVB-T channels for Berlin (Germany) to channels.conf.terr @@ -2235,7 +2235,7 @@ Video Disk Recorder Revision History - Some corrections to the Finnish OSD texts (thanks to Jaakko Hyvätti). - Officially released as version 1.2.0. -2003-06-06: Version 1.2.1 +2003-06-07: Version 1.2.1 - Fixed OSD access in case none of the devices provides one (thanks to Axel Gruber for reporting this one). @@ -2245,3 +2245,6 @@ Video Disk Recorder Revision History for reporting this one). - Completed Hungarian language texts (thanks to Istvan Koenigsberger and Guido Josten). +- Fixed device handling in the CICAM menu in case a VDR instance was started + with a specific device using the -D option (thanks to Gerald Raaf for reporting + ths one). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.255 2003/06/06 14:59:47 kls Exp $ + * $Id: menu.c 1.256 2003/06/07 12:31:57 kls Exp $ */ #include "menu.h" @@ -2109,8 +2109,9 @@ cMenuSetupCICAM::cMenuSetupCICAM(void) for (int d = 0; d < cDevice::NumDevices(); d++) { for (int i = 0; i < 2; i++) { char buffer[32]; - snprintf(buffer, sizeof(buffer), "%s%d %d", tr("Setup.CICAM$CICAM DVB"), d + 1, i + 1); - Add(new cMenuEditCaItem(buffer, &data.CaCaps[d][i])); + int CardIndex = cDevice::GetDevice(d)->CardIndex(); + snprintf(buffer, sizeof(buffer), "%s%d %d", tr("Setup.CICAM$CICAM DVB"), CardIndex + 1, i + 1); + Add(new cMenuEditCaItem(buffer, &data.CaCaps[CardIndex][i])); } } SetHelpKeys(); |