2 files changed, 4 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 0ea32af1..0040b4b0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6703,3 +6703,5 @@ Video Disk Recorder Revision History
 
 - Fixed detecting frames for channels that split frames into several payloads
   (reported by Derek Kelly).
+- Now initializing Setup.InitialChannel to an empty string to avoid problems in
+  case there is no setup.conf.
diff --git a/config.c b/config.c
index 6767b5c6..73bb00d6 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 2.14 2011/06/13 14:41:01 kls Exp $
+ * $Id: config.c 2.15 2011/08/20 09:12:05 kls Exp $
  */
 
 #include "config.h"
@@ -395,7 +395,7 @@ cSetup::cSetup(void)
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
   CurrentDolby = 0;
-  // InitialChannel is initialized by constructor
+  InitialChannel = "";
   InitialVolume = -1;
   ChannelsWrap = 0;
   EmergencyExit = 1;