Permalink
Browse files

Fixed timer related issue where the addon could crash due to no epg i…

…nformation when using epg based timers
  • Loading branch information...
1 parent 2b3893e commit 4f4dd39c422863a57b011fca5da2899389739876 @zeroniak zeroniak committed Dec 9, 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.dvblink"
- version="1.6.0.9"
+ version="1.6.0.10"
name="PVR DVBLink Client"
provider-name="Barcode Madness">
<requires>
@@ -18,6 +18,9 @@
<summary lang="en">PVR Plugin for DVBLink</summary>
<description lang="en">PVR Plugin for DVBLink from DvbLogic.com; supporting streaming of Live TV &amp; Recordings, EPG, Timers</description>
<disclaimer lang="en">This is unstable software! The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects..</disclaimer>
+ <summary lang="da">PVR Plugin til DVBLink</summary>
+ <description lang="da">PVR Plugin til DVBLink fra DvbLogic.com; supportere streaming af Live TV &amp; Optagelser, EPG, Timers</description>
+ <disclaimer lang="da">Dette er ustabilt software! Udgiveren kan p� ingen m�de drages ansvarlig for manglende optagelser, forkerte timers, spildte timer, eller andre u�nskede effekter.</disclaimer>
<platform>@OS@</platform>
</extension>
</addon>
@@ -1,3 +1,6 @@
+[B]Version 1.6.0.10[/B]
+Fixed: Timer related crash when addon could not find program information for EPG based timers
+
[B]Version 1.6.0.9[/B]
Added: Better notification and logging of status / error information
@@ -171,11 +171,14 @@ PVR_ERROR DVBLinkClient::GetTimers(ADDON_HANDLE handle)
xbmcTimer.state = PVR_TIMER_STATE_SCHEDULED;
xbmcTimer.bIsRepeating = schedule->Repeat;
PVR_STR2INT(xbmcTimer.iEpgUid,schedule->GetProgramID().c_str());
-
EpgSearchResult epgSearchResult;
if (DoEPGSearch(epgSearchResult,schedule->GetChannelID(), -1, -1,schedule->GetProgramID())) {
+ if (epgSearchResult.size() < 1 || epgSearchResult[0]->GetEpgData().size() < 1)
+ {
+ XBMC->Log(LOG_INFO, "No EPG program data for timer '%s' on channel '%s' with program id '%s'", schedule->GetID().c_str(),schedule->GetChannelID().c_str(),schedule->GetProgramID().c_str());
+ continue;
+ }
ChannelEpgData * channelepgdata = epgSearchResult[0];
-
Program * program = channelepgdata->GetEpgData()[0];
xbmcTimer.startTime =program->GetStartTime();

0 comments on commit 4f4dd39

Please sign in to comment.