aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <machine.sanctum@gmail.com>2014-12-01 10:27:08 +0100
committerMartijn Kaijser <machine.sanctum@gmail.com>2014-12-01 10:27:08 +0100
commit6d94fe9c79c60b909645c26f6e567eae13485efc (patch)
tree4e3e3692e24d3e03c07e5e093bde53e4d55c6c32
parentbcfc032da21127930f699d69070d9a3450766038 (diff)
parent791b873a32be4c1bcf8e6eb2d4b20fe6a290b99b (diff)
Merge pull request #5852 from xhaggi/pvr-fix-selecting-item-in-channelosd
[pvr] fix: select the first item if we don't have a stored last selected item path
-rw-r--r--xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
index 6203d3c173..5fb5c7917e 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
@@ -214,7 +214,11 @@ void CGUIDialogPVRChannelsOSD::RestoreControlStates()
CPVRChannelGroupPtr group = GetPlayingGroup();
if (group)
{
- m_viewControl.SetSelectedItem(GetLastSelectedItemPath(group->GroupID()));
+ std::string path = GetLastSelectedItemPath(group->GroupID());
+ if (!path.empty())
+ m_viewControl.SetSelectedItem(path);
+ else
+ m_viewControl.SetSelectedItem(0);
}
}