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

Fixed reading the EPG preferred language parameter from 'setup.conf'

This commit is contained in:
Klaus Schmidinger 2004-02-09 17:04:50 +01:00
parent a605ca5cdb
commit d828badbe0
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -2651,3 +2651,7 @@ Video Disk Recorder Revision History
- Removed the now obsolete CaCaps stuff. The Setup/CICAM menu now displays the - Removed the now obsolete CaCaps stuff. The Setup/CICAM menu now displays the
actual CAM type as reported by the CAM. The 'ca.conf' file has been stripped actual CAM type as reported by the CAM. The 'ca.conf' file has been stripped
down to the values 0..4. down to the values 0..4.
2004-02-09: Version 1.3.5
- Fixed reading the EPG preferred language parameter from 'setup.conf'.

6
config.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: config.c 1.122 2004/02/08 15:04:41 kls Exp $ * $Id: config.c 1.123 2004/02/09 16:57:59 kls Exp $
*/ */
#include "config.h" #include "config.h"
@ -374,7 +374,9 @@ bool cSetup::ParseLanguages(const char *Value, int *Values)
{ {
int n = 0; int n = 0;
while (Value && *Value && n < I18nNumLanguages) { while (Value && *Value && n < I18nNumLanguages) {
int i = I18nLanguageIndex(Value); char buffer[4];
strn0cpy(buffer, Value, sizeof(buffer));
int i = I18nLanguageIndex(buffer);
if (i >= 0) if (i >= 0)
Values[n++] = i; Values[n++] = i;
if ((Value = strchr(Value, ' ')) != NULL) if ((Value = strchr(Value, ' ')) != NULL)

6
config.h
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: config.h 1.186 2004/02/08 15:04:52 kls Exp $ * $Id: config.h 1.187 2004/02/09 17:04:09 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -20,8 +20,8 @@
#include "i18n.h" #include "i18n.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.3.4" #define VDRVERSION "1.3.5"
#define VDRVERSNUM 10304 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10305 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99