Fixed displaying the group separators in the channel display

This commit is contained in:
Klaus Schmidinger 2002-11-01 12:18:45 +01:00
parent 0813564ed6
commit 5a418a9efe
3 changed files with 7 additions and 4 deletions

View File

@ -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

View File

@ -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).

8
menu.c
View File

@ -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);