pvr: recreate pvr views when the pvr db is reset

opdenkamp · May 8, 2011 · abc1469 · abc1469
1 parent d1d81a4
commit abc1469
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
@@ -235,7 +235,7 @@ void CPVRManager::Process(void)
   /* reset observers that are observing pvr related data in the pvr windows, or updates won't work after a reload */
   CGUIWindowPVR *pWindow = (CGUIWindowPVR *) g_windowManager.GetWindow(WINDOW_PVR);
   if (pWindow)
-    pWindow->ResetObservers();
+    pWindow->Reset();
 
   /* start the other pvr related update threads */
   m_addons->Start();

diff --git a/xbmc/pvr/windows/GUIWindowPVR.cpp b/xbmc/pvr/windows/GUIWindowPVR.cpp
@@ -272,10 +272,21 @@ void CGUIWindowPVR::UnlockWindow(void)
   }
 }
 
-void CGUIWindowPVR::ResetObservers(void)
+void CGUIWindowPVR::Reset(void)
 {
+  CSingleLock graphicsLock(g_graphicsContext);
   CSingleLock lock(m_critSection);
 
+  if (m_bViewsCreated)
+  {
+    delete m_windowChannelsRadio;
+    delete m_windowChannelsTV;
+    delete m_windowGuide;
+    delete m_windowRecordings;
+    delete m_windowSearch;
+    delete m_windowTimers;
+  }
+
   CreateViews();
 
   m_windowChannelsRadio->ResetObservers();

diff --git a/xbmc/pvr/windows/GUIWindowPVR.h b/xbmc/pvr/windows/GUIWindowPVR.h
@@ -58,7 +58,7 @@ namespace PVR
     virtual void OnWindowLoaded(void);
     virtual void OnWindowUnload(void);
     virtual void InitializeEpgCache(void);
-    virtual void ResetObservers(void);
+    virtual void Reset(void);
 
     void UnlockWindow();