[PVR] Guide window: Prevent concurrent updates.

1 files changed, 10 insertions, 0 deletions

diff --git a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp
index 797eb5fbd5..969eebb40f 100644
--- a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp
+++ b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp
@@ -192,6 +192,16 @@ void CGUIWindowPVRGuideBase::UpdateButtons(void)
 
 bool CGUIWindowPVRGuideBase::Update(const std::string &strDirectory, bool updateFilterPath /* = true */)
 {
+  if (m_vecItemsUpdating)
+  {
+    // Prevent concurrent updates. Instead, let the timeline items refresh thread pick it up later.
+    CSingleLock lock(m_critSection);
+    m_bRefreshTimelineItems = true;
+    return true;
+  }
+
+  CUpdateGuard guard(m_vecItemsUpdating);
+
   bool bReturn = CGUIWindowPVRBase::Update(strDirectory, updateFilterPath);
 
   if (bReturn && !m_bChannelSelectionRestored)