diff --git a/HISTORY b/HISTORY index c082442d..d4832482 100644 --- a/HISTORY +++ b/HISTORY @@ -4950,3 +4950,8 @@ Video Disk Recorder Revision History - Fixed handling language codes and descriptions of recorded audio tracks on channels with multiple tracks where not all of them appear in the event data (reported by Boguslaw Juza). + +2006-10-09: Version 1.4.3-2 + +- Fixed clearing an event's Title, ShortText and Description in case the data comes + from an external source. diff --git a/config.h b/config.h index bc3ebd64..9fba40d4 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.272 2006/09/24 10:09:25 kls Exp $ + * $Id: config.h 1.273 2006/10/09 16:12:33 kls Exp $ */ #ifndef __CONFIG_H @@ -21,7 +21,7 @@ // VDR's own version number: -#define VDRVERSION "1.4.3-1" +#define VDRVERSION "1.4.3-2" #define VDRVERSNUM 10403 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff --git a/eit.c b/eit.c index 23ae987d..2b07b87c 100644 --- a/eit.c +++ b/eit.c @@ -8,7 +8,7 @@ * Robert Schneider and Rolf Hakenes . * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg . * - * $Id: eit.c 1.121 2006/10/07 12:32:24 kls Exp $ + * $Id: eit.c 1.122 2006/10/09 16:14:36 kls Exp $ */ #include "eit.h" @@ -234,7 +234,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer))); pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer))); } - else { + else if (!HasExternalData) { pEvent->SetTitle(NULL); pEvent->SetShortText(NULL); } @@ -242,7 +242,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1]; pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": ")); } - else + else if (!HasExternalData) pEvent->SetDescription(NULL); } delete ExtendedEventDescriptors; @@ -250,7 +250,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo pEvent->SetComponents(Components); - pEvent->FixEpgBugs(); + if (!HasExternalData) + pEvent->FixEpgBugs(); if (LinkChannels) channel->SetLinkChannels(LinkChannels); Modified = true;