From b863d9a7024fdc4d31571565e3afe646dedffa9f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 12 Aug 2011 13:21:42 +0200
Subject: [PATCH] Fixed handling the channelID in cMenuEditChanItem

---
 CONTRIBUTORS | 1 +
 HISTORY      | 3 ++-
 menuitems.c  | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a39d71b5..b0991c44 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1701,6 +1701,7 @@ Udo Richter <udo_richter@gmx.de>
  for a patch to "Made updating the editing marks during replay react faster in case
  the marks file has just been written"
  for suggesting a fix for a bug in handling DiSEqC codes
+ for fixing handling the channelID in cMenuEditChanItem
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index 1cf82693..7dba3020 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6650,7 +6650,7 @@ Video Disk Recorder Revision History
 - Added support for "content identifier descriptor" and "default authority descriptor"
   to 'libsi' (thanks to Dave Pickles).
 
-2011-08-07: Version 1.7.20
+2011-08-12: Version 1.7.20
 
 - Added some missing 'const' to tChannelID (reported by Sundararaj Reel).
 - The isnumber() function now checks the given pointer for NULL (thanks to Holger
@@ -6673,3 +6673,4 @@ Video Disk Recorder Revision History
   not yet known when a new payload starts. This adds no overhead for channels
   that broadcast the frame type within the first TS packet of a payload; it only
   kicks in if that information is not in the first TS packet.
+- Fixed handling the channelID in cMenuEditChanItem (thanks to Udo Richter).
diff --git a/menuitems.c b/menuitems.c
index bc04e72c..e7797d6e 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.9 2011/06/13 14:48:41 kls Exp $
+ * $Id: menuitems.c 2.10 2011/08/12 13:19:40 kls Exp $
  */
 
 #include "menuitems.h"
@@ -736,9 +736,14 @@ void cMenuEditChanItem::Set(void)
      cChannel *channel = Channels.GetByNumber(*value);
      snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
      SetValue(buf);
+     if (channelID)
+        *channelID = channel->GetChannelID().ToString();
      }
-  else if (noneString)
+  else if (noneString) {
      SetValue(noneString);
+     if (channelID)
+        *channelID = "";
+     }
 }
 
 eOSState cMenuEditChanItem::ProcessKey(eKeys Key)