[PVR] Guide window: Optimize re-opening of the window (re-use item li…

…st if no changes came in while window was not active).

xbmc/pvr/windows/GUIWindowPVRGuide.cpp

@@ -56,6 +56,8 @@ CGUIWindowPVRGuide::CGUIWindowPVRGuide(bool bRadio) :
 CGUIWindowPVRGuide::~CGUIWindowPVRGuide(void)
 {
   g_EpgContainer.UnregisterObserver(this);
+
+  m_bRefreshTimelineItems = false;
   StopRefreshTimelineItemsThread();
 }
 
@@ -74,7 +76,6 @@ void CGUIWindowPVRGuide::Init()
   }
 
   StartRefreshTimelineItemsThread();
-  m_bRefreshTimelineItems = true; // force data update on window open/re-open
 }
 
 void CGUIWindowPVRGuide::ClearData()
@@ -103,7 +104,16 @@ void CGUIWindowPVRGuide::OnDeinitWindow(int nextWindowID)
 {
   StopRefreshTimelineItemsThread();
 
-  m_bChannelSelectionRestored = false;
+  {
+    CSingleLock lock(m_critSection);
+    m_bChannelSelectionRestored = false;
+    if (m_vecItems && !m_newTimeline)
+    {
+      // speedup: save a copy of current items for reuse when re-opening the window
+      m_newTimeline.reset(new CFileItemList);
+      m_newTimeline->Copy(*m_vecItems);
+    }
+  }
 
   CGUIWindowPVRBase::OnDeinitWindow(nextWindowID);
 }
@@ -118,19 +128,15 @@ void CGUIWindowPVRGuide::StartRefreshTimelineItemsThread()
 void CGUIWindowPVRGuide::StopRefreshTimelineItemsThread()
 {
   if (m_refreshTimelineItemsThread)
-  {
-    m_bRefreshTimelineItems = false;
     m_refreshTimelineItemsThread->Stop();
-  }
 }
 
 void CGUIWindowPVRGuide::Notify(const Observable &obs, const ObservableMessage msg)
 {
-  if (IsActive() &&
-      (msg == ObservableMessageEpg ||
-       msg == ObservableMessageEpgContainer ||
-       msg == ObservableMessageChannelGroupReset ||
-       msg == ObservableMessageChannelGroup))
+  if (msg == ObservableMessageEpg ||
+      msg == ObservableMessageEpgContainer ||
+      msg == ObservableMessageChannelGroupReset ||
+      msg == ObservableMessageChannelGroup)
   {
     CSingleLock lock(m_critSection);
     m_bRefreshTimelineItems = true;