aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xbmc/pvr/guilib/PVRGUIActionsChannels.cpp2
-rw-r--r--xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp13
2 files changed, 14 insertions, 1 deletions
diff --git a/xbmc/pvr/guilib/PVRGUIActionsChannels.cpp b/xbmc/pvr/guilib/PVRGUIActionsChannels.cpp
index fe1b652273..86dfc0516b 100644
--- a/xbmc/pvr/guilib/PVRGUIActionsChannels.cpp
+++ b/xbmc/pvr/guilib/PVRGUIActionsChannels.cpp
@@ -428,7 +428,7 @@ std::string CPVRGUIActionsChannels::GetSelectedChannelPath(bool bRadio) const
const std::shared_ptr<CPVRChannelGroupMember> playingChannel =
mgr.PlaybackState()->GetPlayingChannelGroupMember();
if (playingChannel && playingChannel->IsRadio() == bRadio)
- return playingChannel->Path();
+ return GetChannelGroupMember(playingChannel->Channel())->Path();
const std::shared_ptr<CPVREpgInfoTag> playingTag = mgr.PlaybackState()->GetPlayingEpgTag();
if (playingTag && playingTag->IsRadio() == bRadio)
diff --git a/xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp b/xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp
index 185e55165e..6d15b00826 100644
--- a/xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp
+++ b/xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp
@@ -1565,6 +1565,19 @@ bool CPVRGUIInfo::GetListItemAndPlayerBool(const CFileItem* item,
return true;
}
break;
+ case LISTITEM_ISPLAYING:
+ if (item->IsPVRChannel())
+ {
+ const std::shared_ptr<CPVRChannel> playingChannel{
+ CServiceBroker::GetPVRManager().PlaybackState()->GetPlayingChannel()};
+ if (playingChannel)
+ {
+ const std::shared_ptr<CPVRChannel> channel{item->GetPVRChannelInfoTag()};
+ bValue = (channel->StorageId() == playingChannel->StorageId());
+ return true;
+ }
+ }
+ break;
case MUSICPLAYER_CONTENT:
case VIDEOPLAYER_CONTENT:
if (item->IsPVRChannel())