From 6af3193b02118027179574b933ebccdde8ac20d0 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Fri, 10 Dec 2021 14:59:00 +0100 Subject: In menu "Search Recordins" get ChannelName from 'RecInfo' Alternatively fallback via 'ChannelID' from the active channel list. --- recmenuitem.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/recmenuitem.c b/recmenuitem.c index 5362be5..067bd57 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -2278,15 +2278,24 @@ void cRecMenuItemRecording::Draw(void) { if (!recording) return; const cRecordingInfo *recInfo = recording->Info(); + const cChannel *channel = NULL; + cString channelName = tr("unknown channel"); + if (recInfo) { + if (recInfo->ChannelName() && (strlen(recInfo->ChannelName()) > 0)) { + channelName = recInfo->ChannelName(); + } else { #if VDRVERSNUM >= 20301 - LOCK_CHANNELS_READ; - const cChannel *channel = Channels->GetByChannelID(recInfo->ChannelID()); + { + LOCK_CHANNELS_READ; + channel = Channels->GetByChannelID(recInfo->ChannelID()); + } #else - const cChannel *channel = Channels.GetByChannelID(recInfo->ChannelID()); + channel = Channels.GetByChannelID(recInfo->ChannelID()); #endif - cString channelName = tr("unknown channel"); - if (channel) - channelName = channel->Name(); + if (channel) + channelName = channel->Name(); + } + } cString name = recording->Name(); cString dateTime = cString::sprintf("%s, %s", *DateString(recording->Start()), *TimeString(recording->Start())); -- cgit v1.2.3