Fixed displaying the group separators in the channel display

3 files changed, 7 insertions, 4 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3e991c19..2af13e17 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -47,6 +47,7 @@ Martin Hammerschmid <martin@hammerschmid.com>
  for detecting a deadlock when switching channels via Schedule/Now|Next/Switch
  for adding a missing #include to ringbuffer.c
  for adding a missing 'public' keyword in device.h
+ for pointing out a bug in displaying the group separators in the channel display
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
diff --git a/HISTORY b/HISTORY
index 55c27585..98e562be 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1683,3 +1683,5 @@ Video Disk Recorder Revision History
   (thanks to Oliver Endriss for reporting this one).
 - Fixed handling audio tracks in cDvbDevice.
 - Updated channels.conf.terr (thanks to Uwe Scheffler).
+- Fixed displaying the group separators in the channel display (thanks to Martin
+  Hammerschmid for pointing out this one).
diff --git a/menu.c b/menu.c
index 0bd24be8..47ad091b 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.221 2002/10/27 14:06:02 kls Exp $
+ * $Id: menu.c 1.222 2002/11/01 12:15:45 kls Exp $
  */
 
 #include "menu.h"
@@ -2378,10 +2378,10 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
   char buffer[BufSize];
   *buffer = 0;
   if (Channel) {
-     if (Channel->Number() > 0)
-        snprintf(buffer, BufSize, "%d%s  %s", Channel->Number(), number ? "-" : "", Channel->Name());
-     else if (Channel->Name())
+     if (Channel->GroupSep())
         snprintf(buffer, BufSize, "%s", Channel->Name());
+     else
+        snprintf(buffer, BufSize, "%d%s  %s", Channel->Number(), number ? "-" : "", Channel->Name());
      }
   else if (number)
      snprintf(buffer, BufSize, "%d-", number);