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

Fixed a crash in the Schedule menu with events that have no title (cEvent::FixEpgBugs() now assigns a "No title" string to events that have no title)

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-01-20 14:15:27 +01:00
parent c60129ed78
commit 837f5e2ea9
3 changed files with 184 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -936,6 +936,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for reporting a bug in handling key macros with keys after @plugin for reporting a bug in handling key macros with keys after @plugin
for adding compiler options "-fPIC -g" to all plugins for adding compiler options "-fPIC -g" to all plugins
for adding a leading '0' to the day in the DayDateTime() function for adding a leading '0' to the day in the DayDateTime() function
for reporting a crash in the Schedule menu with events that have no title
Ralf Klueber <ralf.klueber@vodafone.com> Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark for reporting a bug in cutting a recording if there is only a single editing mark

3
HISTORY
View File

@ -4202,3 +4202,6 @@ Video Disk Recorder Revision History
pointers from cChannel objects (reported by Malte Schröder). pointers from cChannel objects (reported by Malte Schröder).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Improved NULL checking in strreplace(). - Improved NULL checking in strreplace().
- Fixed a crash in the Schedule menu with events that have no title (reported by
Rolf Ahrenberg). cEvent::FixEpgBugs() now assigns a "No title" string to events
that have no title.

15
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.50 2006/01/20 13:42:38 kls Exp $ * $Id: epg.c 1.51 2006/01/20 14:09:48 kls Exp $
*/ */
#include "epg.h" #include "epg.h"
@ -422,12 +422,17 @@ void cEvent::FixEpgBugs(void)
strreplace(description, '\x86', ' '); strreplace(description, '\x86', ' ');
strreplace(description, '\x87', ' '); strreplace(description, '\x87', ' ');
if (!title) {
// we don't want any "(null)" titles
title = strcpyrealloc(title, tr("No title"));
EpgBugFixStat(12, ChannelID());
}
if (Setup.EPGBugfixLevel == 0) if (Setup.EPGBugfixLevel == 0)
return; return;
// Some TV stations apparently have their own idea about how to fill in the // Some TV stations apparently have their own idea about how to fill in the
// EPG data. Let's fix their bugs as good as we can: // EPG data. Let's fix their bugs as good as we can:
if (title) {
// Some channels put the ShortText in quotes and use either the ShortText // Some channels put the ShortText in quotes and use either the ShortText
// or the Description field, depending on how long the string is: // or the Description field, depending on how long the string is:
@ -608,12 +613,6 @@ void cEvent::FixEpgBugs(void)
} }
} }
} }
}
else {
// we don't want any "(null)" titles
title = strcpyrealloc(title, tr("No title"));
EpgBugFixStat(12, ChannelID());
}
} }
// --- cSchedule ------------------------------------------------------------- // --- cSchedule -------------------------------------------------------------