fixed missing epgname token in recmenu

This commit is contained in:
louis 2016-02-09 14:50:31 +01:00
parent 1feae66df2
commit b7d25009c0
1 changed files with 11 additions and 3 deletions

View File

@ -1409,7 +1409,6 @@ bool cLeMenuRecordings::Parse(bool forced) {
char *recName = RecName(recording->Name(), level); char *recName = RecName(recording->Name(), level);
tokenContainer->AddStringToken((int)eLeMenuRecordingsST::name, recName); tokenContainer->AddStringToken((int)eLeMenuRecordingsST::name, recName);
delete[] recName;
const cRecording *usedRecording = recording; const cRecording *usedRecording = recording;
@ -1458,9 +1457,17 @@ bool cLeMenuRecordings::Parse(bool forced) {
const cEvent *event = NULL; const cEvent *event = NULL;
const cRecordingInfo *info = usedRecording->Info(); const cRecordingInfo *info = usedRecording->Info();
if (!info) return true; if (!info) {
delete[] recName;
return true;
}
event = info->GetEvent(); event = info->GetEvent();
if (!event) return true; if (!event) {
delete[] recName;
return true;
}
tokenContainer->AddStringToken((int)eLeMenuRecordingsST::epgname, info->Title() ? info->Title() : recName);
delete[] recName;
cString recDate = event->GetDateString(); cString recDate = event->GetDateString();
cString recTime = event->GetTimeString(); cString recTime = event->GetTimeString();
@ -1694,6 +1701,7 @@ bool cCeMenuRecordings::Parse(bool forced) {
event = info->GetEvent(); event = info->GetEvent();
if (!event) return true; if (!event) return true;
tokenContainer->AddStringToken((int)eCeMenuRecordingsST::epgname, info->Title() ? info->Title() : buffer.c_str());
cString recDate = event->GetDateString(); cString recDate = event->GetDateString();
cString recTime = event->GetTimeString(); cString recTime = event->GetTimeString();
if (strstr(*recDate, "1970")) { if (strstr(*recDate, "1970")) {