Fixed creating a new channel in the "Channels" menu in case the 'channels.conf' contains ':@nnn' lines with no text

2 files changed, 6 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index c4299054..ec405655 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2254,9 +2254,12 @@ Video Disk Recorder Revision History
 - Some corrections to the Finnish OSD texts (thanks to Niko Tarnanen and Rolf
   Ahrenberg).
 
-2003-06-12: Version 1.2.2
+2003-06-15: Version 1.2.2
 
 - Fixed a bug in channel switching after Left/Right has been pressed (thanks to
   Michael Walle for reporting this one).
 - Improved channel switching in case of numerical input by switching as soon as
   the channel is unique (suggested by Jaakko Hyvätti).
+- Fixed creating a new channel in the "Channels" menu in case the 'channels.conf'
+  contains ':@nnn' lines with no text (thanks to Guy Roussin for reporting this
+  one).
diff --git a/menu.c b/menu.c
index 32db4170..c9f4f457 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.258 2003/06/13 14:31:15 kls Exp $
+ * $Id: menu.c 1.259 2003/06/15 12:25:47 kls Exp $
  */
 
 #include "menu.h"
@@ -733,7 +733,7 @@ eOSState cMenuChannels::New(void)
 {
   if (HasSubMenu())
      return osContinue;
-  return AddSubMenu(new cMenuEditChannel(Channels.Get(Current()), true));
+  return AddSubMenu(new cMenuEditChannel(GetChannel(Current()), true));
 }
 
 eOSState cMenuChannels::Delete(void)