frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Avoiding duplicate components in EPG events when reading epg.data or in the PUTE SVDRP command

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-07-30 14:53:29 +02:00
parent aaa2284278
commit 44a4d12117
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1287,6 +1287,7 @@ Olaf Titz <olaf@bigred.inka.de>
for fixing some typos in the Makefile's 'font' target for fixing some typos in the Makefile's 'font' target
for reporting a problem and some advice in fixing a possible freeze in pause mode for reporting a problem and some advice in fixing a possible freeze in pause mode
in case a device's PlayPesPacket() function permanently returns 0 in case a device's PlayPesPacket() function permanently returns 0
for reporting excess memory consumption due to duplicate components in EPG events
Darren Salt <linux@youmustbejoking.demon.co.uk> Darren Salt <linux@youmustbejoking.demon.co.uk>
for pointing out that the '-' and 'ö' characters need to be escaped in the man for pointing out that the '-' and 'ö' characters need to be escaped in the man

2
HISTORY
View File

@ -3646,3 +3646,5 @@ Video Disk Recorder Revision History
- Removed the fix for handling VPS timers, so that they only record if the event - Removed the fix for handling VPS timers, so that they only record if the event
they are assigned to actually has the given VPS time. This has caused repeating they are assigned to actually has the given VPS time. This has caused repeating
VPS timers to stop recording prematurely. VPS timers to stop recording prematurely.
- Avoiding duplicate components in EPG events when reading epg.data or in the
PUTE SVDRP command (thanks to Olaf Titz for reporting this one).

4
epg.c
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by * Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* *
* $Id: epg.c 1.35 2005/06/05 12:17:15 kls Exp $ * $Id: epg.c 1.36 2005/07/30 14:44:54 kls Exp $
*/ */
#include "epg.h" #include "epg.h"
@ -298,6 +298,8 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
if (n == 3 || n == 4) { if (n == 3 || n == 4) {
Event = (cEvent *)Schedule->GetEvent(EventID, StartTime); Event = (cEvent *)Schedule->GetEvent(EventID, StartTime);
cEvent *newEvent = NULL; cEvent *newEvent = NULL;
if (Event)
DELETENULL(Event->components);
if (!Event) if (!Event)
Event = newEvent = new cEvent(EventID); Event = newEvent = new cEvent(EventID);
if (Event) { if (Event) {