Skip to content
This repository
Browse code

pvr window: switch to new view before showing dummy busy item

dummy item might cause crash if timeline was last view
  • Loading branch information...
commit 141fb530ad6654ccad362d061f7648499670d31d 1 parent cbb08fb
Michal Piechowiak authored December 04, 2012
2  xbmc/pvr/windows/GUIWindowPVRChannels.cpp
@@ -207,9 +207,9 @@ void CGUIWindowPVRChannels::UpdateData(bool bUpdateSelectedFile /* = true */)
207 207
   CPVRChannelGroupPtr selectedGroup = SelectedGroup();
208 208
 
209 209
   m_iSelected = m_parent->m_viewControl.GetSelectedItem();
  210
+  m_parent->m_viewControl.SetCurrentView(m_iControlList);
210 211
   ShowBusyItem();
211 212
   m_parent->m_vecItems->Clear();
212  
-  m_parent->m_viewControl.SetCurrentView(m_iControlList);
213 213
 
214 214
   CPVRChannelGroupPtr currentGroup = g_PVRManager.GetPlayingGroup(m_bRadio);
215 215
   if (!currentGroup)
2  xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
@@ -208,9 +208,9 @@ void CGUIWindowPVRRecordings::UpdateData(bool bUpdateSelectedFile /* = true */)
208 208
   else
209 209
     m_strSelectedPath = m_parent->m_vecItems->GetPath();
210 210
 
  211
+  m_parent->m_viewControl.SetCurrentView(m_iControlList);
211 212
   ShowBusyItem();
212 213
   m_parent->m_vecItems->Clear();
213  
-  m_parent->m_viewControl.SetCurrentView(m_iControlList);
214 214
   m_parent->m_vecItems->SetPath(m_strSelectedPath);
215 215
   m_parent->Update(m_strSelectedPath);
216 216
   m_parent->m_viewControl.SetItems(*m_parent->m_vecItems);
2  xbmc/pvr/windows/GUIWindowPVRTimers.cpp
@@ -105,9 +105,9 @@ void CGUIWindowPVRTimers::UpdateData(bool bUpdateSelectedFile /* = true */)
105 105
   CSingleLock graphicsLock(g_graphicsContext);
106 106
 
107 107
   m_iSelected = m_parent->m_viewControl.GetSelectedItem();
  108
+  m_parent->m_viewControl.SetCurrentView(m_iControlList);
108 109
   ShowBusyItem();
109 110
   m_parent->m_vecItems->Clear();
110  
-  m_parent->m_viewControl.SetCurrentView(m_iControlList);
111 111
   m_parent->m_vecItems->SetPath("pvr://timers/");
112 112
   m_parent->Update(m_parent->m_vecItems->GetPath());
113 113
   m_parent->m_vecItems->Sort(m_iSortMethod, m_iSortOrder);

0 notes on commit 141fb53

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