diff --git a/HISTORY b/HISTORY index 1038d27d..b827bd86 100644 --- a/HISTORY +++ b/HISTORY @@ -2572,7 +2572,7 @@ Video Disk Recorder Revision History branches are tested, cable and terrestrial need to be tested by somebody who actually has such equipment. -2004-01-16: Version 1.3.2 +2004-01-17: Version 1.3.2 - Fixed resetting the EPG data versions after changing the preferred languages (thanks to Teemu Rantanen for reporting this one and helping to debug it). @@ -2590,3 +2590,5 @@ Video Disk Recorder Revision History being detected that used to be detected with the 'scan' utility or the original 'autopid' patch ;-). - Channels with a zero VPID no longer write a PPID into channels.conf. +- Short channel names are now only stored if they actually differ from the + full name. diff --git a/sdt.c b/sdt.c index cd427aca..c61c4e29 100644 --- a/sdt.c +++ b/sdt.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: sdt.c 1.5 2004/01/16 14:59:06 kls Exp $ + * $Id: sdt.c 1.6 2004/01/17 11:29:51 kls Exp $ */ #include "sdt.h" @@ -78,7 +78,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length } *pn = *ps = 0; pn = NameBuf; - if (*NameBuf && *ShortNameBuf) { + if (*NameBuf && *ShortNameBuf && strcmp(NameBuf, ShortNameBuf) != 0) { *ps++ = ','; strcpy(ps, NameBuf); pn = ShortNameBuf;