Skip to content
This repository
Browse code

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

  • Loading branch information...
commit b5ba7eb65bdc070d29550e3d6f340357edb91da6 1 parent 2dd6509
Peter Frühberger authored August 17, 2013
9  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
@@ -148,8 +148,10 @@ bool CGUIDialogPVRChannelsOSD::OnAction(const CAction &action)
148 148
 CPVRChannelGroupPtr CGUIDialogPVRChannelsOSD::GetPlayingGroup()
149 149
 {
150 150
   CPVRChannelPtr channel;
151  
-  g_PVRManager.GetCurrentChannel(channel);
152  
-  return g_PVRManager.GetPlayingGroup(channel->IsRadio());
  151
+  if(g_PVRManager.GetCurrentChannel(channel))
  152
+    return g_PVRManager.GetPlayingGroup(channel->IsRadio());
  153
+  else
  154
+    return CPVRChannelGroupPtr();
153 155
 }
154 156
 
155 157
 void CGUIDialogPVRChannelsOSD::Update()
@@ -190,7 +192,8 @@ void CGUIDialogPVRChannelsOSD::SaveControlStates()
190 192
   CGUIDialog::SaveControlStates();
191 193
 
192 194
   CPVRChannelGroupPtr group = GetPlayingGroup();
193  
-  SaveSelectedItem(group->GroupID());
  195
+  if(group)
  196
+    SaveSelectedItem(group->GroupID());
194 197
 }
195 198
 
196 199
 void CGUIDialogPVRChannelsOSD::RestoreControlStates()

0 notes on commit b5ba7eb

Please sign in to comment.
Something went wrong with that request. Please try again.