Fixed a bug in the EPG bugfix mechanism if the extended description is shorter than 3 characters

This commit is contained in:
Klaus Schmidinger 2002-04-01 13:01:27 +02:00
parent 5833ea922a
commit 46c8afe443
3 changed files with 7 additions and 3 deletions

View File

@ -130,6 +130,8 @@ Andreas Schultz <aschultz@warp10.net>
dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>) dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>)
for adding PTS to the converted PCM audio when replaying a DVD for adding PTS to the converted PCM audio when replaying a DVD
for fixing a crash in case there is no 'epg.data' at program start for fixing a crash in case there is no 'epg.data' at program start
for fixing a bug in the EPG bugfix mechanism if the extended description is shorter
than 3 characters
Aaron Holtzman Aaron Holtzman
for writing 'ac3dec' for writing 'ac3dec'

View File

@ -1168,3 +1168,5 @@ Video Disk Recorder Revision History
- Changed the default 'Ok' key when using the PC keyboard from '5' (in the - Changed the default 'Ok' key when using the PC keyboard from '5' (in the
numeric block) to 'Enter', because the '5' key didn't work on keyboards with numeric block) to 'Enter', because the '5' key didn't work on keyboards with
the F-keys on top. the F-keys on top.
- Fixed a bug in the EPG bugfix mechanism if the extended description is shorter
than 3 characters (thanks to Andreas Schultz).

6
eit.c
View File

@ -16,7 +16,7 @@
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* $Id: eit.c 1.41 2002/03/17 14:23:41 kls Exp $ * $Id: eit.c 1.42 2002/04/01 12:58:20 kls Exp $
***************************************************************************/ ***************************************************************************/
#include "eit.h" #include "eit.h"
@ -560,8 +560,8 @@ void cEventInfo::FixEpgBugs(void)
pExtendedDescription = compactspace(pExtendedDescription); pExtendedDescription = compactspace(pExtendedDescription);
// Remove superfluous hyphens: // Remove superfluous hyphens:
if (pExtendedDescription) { if (pExtendedDescription) {
char *p = pExtendedDescription + 1; char *p = pExtendedDescription;
while (*p) { while (*p && *(p + 1) && *(p + 2)) {
if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) { if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten" if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
memmove(p, p + 2, strlen(p + 2) + 1); memmove(p, p + 2, strlen(p + 2) + 1);