From b8c26cd48268597800862a768cc34c60c41d1ffe Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 22 May 2004 10:33:46 +0200
Subject: [PATCH] Fixed a crash when switching the skin and having selected a
 non-default theme that is not available for the newly selected skin

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 6 ++++++
 config.h     | 6 +++---
 themes.c     | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7036bfd6..48e1e229 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -695,6 +695,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
  return from their Receive() function if the buffer runs full
  for reporting a crash in case there is no DVB hardware present
  for his support in debugging the the "Unknown picture type error"
+ for reporting a crash when switching the skin and having selected a non-default
+ theme that is not available for the newly selected skin
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
diff --git a/HISTORY b/HISTORY
index f3ae89fb..8cbf9e44 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2804,3 +2804,9 @@ Video Disk Recorder Revision History
   actual source (sat, cable etc.) into account. Please go into "Setup/EPG" and
   set the "Set system time" and "Use time from transponder" parameters accordingly
   (this is necessary even if you have already set them before!).
+
+2004-05-22: Version 1.3.8
+
+- Fixed a crash when switching the skin and having selected a non-default theme
+  that is not available for the newly selected skin (thanks to Sascha Volkenandt
+  for reporting this one).
diff --git a/config.h b/config.h
index b9845a4e..af3b2ae0 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.193 2004/05/16 12:41:43 kls Exp $
+ * $Id: config.h 1.194 2004/05/22 10:33:46 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.7"
-#define VDRVERSNUM   10307  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.8"
+#define VDRVERSNUM   10308  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/themes.c b/themes.c
index 0232822e..1b6adf9d 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 1.1 2004/05/16 09:43:14 kls Exp $
+ * $Id: themes.c 1.2 2004/05/22 10:30:06 kls Exp $
  */
 
 #include "themes.h"
@@ -274,7 +274,7 @@ int cThemes::GetThemeIndex(const char *Description)
       if (strcmp(descriptions[i], Description) == 0)
          return i;
       if (strcmp(descriptions[i], "Default") == 0)
-         index = 1;
+         index = i;
       }
   return index;
 }