From d828badbe00f4eaa074aed0ab3361c5fd3c0328b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Mon, 9 Feb 2004 17:04:50 +0100
Subject: [PATCH] Fixed reading the EPG preferred language parameter from
 'setup.conf'

---
 HISTORY  | 4 ++++
 config.c | 6 ++++--
 config.h | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index af2b925b..cf4315ff 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2651,3 +2651,7 @@ Video Disk Recorder Revision History
 - 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
   down to the values 0..4.
+
+2004-02-09: Version 1.3.5
+
+- Fixed reading the EPG preferred language parameter from 'setup.conf'.
diff --git a/config.c b/config.c
index 833a2bba..25b64d32 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.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"
@@ -374,7 +374,9 @@ bool cSetup::ParseLanguages(const char *Value, int *Values)
 {
   int n = 0;
   while (Value && *Value && n < I18nNumLanguages) {
-        int i = I18nLanguageIndex(Value);
+        char buffer[4];
+        strn0cpy(buffer, Value, sizeof(buffer));
+        int i = I18nLanguageIndex(buffer);
         if (i >= 0)
            Values[n++] = i;
         if ((Value = strchr(Value, ' ')) != NULL)
diff --git a/config.h b/config.h
index 766126a4..14b3a1ba 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * 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
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.4"
-#define VDRVERSNUM   10304  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.5"
+#define VDRVERSNUM   10305  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99