Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

PVR: Fix stopping when station timeline is open and user presses stop

  • Loading branch information...
commit b5ba7eb65bdc070d29550e3d6f340357edb91da6 1 parent 2dd6509
Peter Frühberger fritsch authored
Showing with 6 additions and 3 deletions.
  1. +6 −3 xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
9 xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
View
@@ -148,8 +148,10 @@ bool CGUIDialogPVRChannelsOSD::OnAction(const CAction &action)
CPVRChannelGroupPtr CGUIDialogPVRChannelsOSD::GetPlayingGroup()
{
CPVRChannelPtr channel;
- g_PVRManager.GetCurrentChannel(channel);
- return g_PVRManager.GetPlayingGroup(channel->IsRadio());
+ if(g_PVRManager.GetCurrentChannel(channel))
+ return g_PVRManager.GetPlayingGroup(channel->IsRadio());
+ else
+ return CPVRChannelGroupPtr();
}
void CGUIDialogPVRChannelsOSD::Update()
@@ -190,7 +192,8 @@ void CGUIDialogPVRChannelsOSD::SaveControlStates()
CGUIDialog::SaveControlStates();
CPVRChannelGroupPtr group = GetPlayingGroup();
- SaveSelectedItem(group->GroupID());
+ if(group)
+ SaveSelectedItem(group->GroupID());
}
void CGUIDialogPVRChannelsOSD::RestoreControlStates()
Please sign in to comment.
Something went wrong with that request. Please try again.