summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Bieringer <pb@bieringer.de>2021-02-06 12:52:19 +0100
committerPeter Bieringer <pb@bieringer.de>2021-02-06 12:52:19 +0100
commitdd30dacb5b5a22254125ca7b56adcfb7d3dbce77 (patch)
tree3e994d7c48d98514d78775b53cd3dffaab46c0c7
parent78483aa3d849d57e91c26058bb0e35c907aa0bc7 (diff)
downloadvdr-plugin-skindesigner-dd30dacb5b5a22254125ca7b56adcfb7d3dbce77.tar.gz
vdr-plugin-skindesigner-dd30dacb5b5a22254125ca7b56adcfb7d3dbce77.tar.bz2
fix crash caused by cVeDmDetailheaderRec::Parse introduced in 1.2.10
-rw-r--r--HISTORY5
-rw-r--r--coreengine/viewelementsdisplaymenu.c12
2 files changed, 9 insertions, 8 deletions
diff --git a/HISTORY b/HISTORY
index 5b884b7..aa71d55 100644
--- a/HISTORY
+++ b/HISTORY
@@ -462,14 +462,14 @@ Version 1.2.9
- [pbiering] added tokens for framesPerSecond and isHD
- [pbiering] improve HD detection code, catch also stream content 9
-Version 1.2.10
+Version 1.2.10 (buggy)
- [pbiering] added tokens for recordings: isUHD, isRadio
- [pbiering] added token for channels: isUHD
- [pbiering] expose to displaymenurecordings: recchannelname, recchannelid
- [pbiering] retrieve ChannelName from 'info' and fallback via ChannelID from active channel list
- [kamel5] Update skin estuary4vdr
-Version 1.2.11
+Version 1.2.11 (buggy)
- [pbiering] align displayed tuner number (0,1,2 -> 1,2,3)
- [pbiering] SVDRP: do not reload in case plugin is not fully initialized (results in VDR crash)
- [pbiering] SVDRP: respond with proper error message in case of OSD is active or parsing error
@@ -477,3 +477,4 @@ Version 1.2.11
Version 1.2.12
- [pbiering] added token for recordings: isRecording
+- [pbiering] fix crash caused by cVeDmDetailheaderRec::Parse introduced in 1.2.10
diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c
index 499c717..972e4f3 100644
--- a/coreengine/viewelementsdisplaymenu.c
+++ b/coreengine/viewelementsdisplaymenu.c
@@ -1223,9 +1223,9 @@ bool cVeDmDetailheaderRec::Parse(bool forced) {
}
if (info->ChannelName() && (strlen(info->ChannelName()) > 0)) {
- tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, info->ChannelName());
- tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, info->ChannelID().ToString());
- tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, 0); // cannot be provided, for backward compatibility only
+ tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, info->ChannelName());
+ tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, info->ChannelID().ToString());
+ tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recchannelnumber, 0); // cannot be provided, for backward compatibility only
} else {
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
LOCK_CHANNELS_READ;
@@ -1234,9 +1234,9 @@ bool cVeDmDetailheaderRec::Parse(bool forced) {
const cChannel *channel = Channels.GetByChannelID(info->ChannelID());
#endif
if (channel) {
- tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, channel->Name());
- tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, *channel->GetChannelID().ToString());
- tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, channel->Number());
+ tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, channel->Name());
+ tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, *channel->GetChannelID().ToString());
+ tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recchannelnumber, channel->Number());
}
}
}