Merge pull request #6092 from Jalle19/speedup-pvr-load

[pvr] don't persist channel groups (includes members) unless the group is fully loaded
xbmc · Jan 20, 2015 · e740097 · e740097
2 parents 59fb902 + 36d276f
commit e740097
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/xbmc/pvr/channels/PVRChannelGroup.cpp b/xbmc/pvr/channels/PVRChannelGroup.cpp
@@ -900,7 +900,8 @@ bool CPVRChannelGroup::Persist(void)
   bool bReturn(true);
   CSingleLock lock(m_critSection);
 
-  if (!HasChanges())
+  /* don't persist until the group is fully loaded and has changes */
+  if (!HasChanges() || !m_bLoaded)
     return bReturn;
 
   if (CPVRDatabase *database = GetPVRDatabase())