Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[pvr] Do not change the labels for recordings found in the library

  • Loading branch information...
commit 27a1d0231328f87e523a522e2a699f214a8bb8f3 1 parent 7dd322e
@axmhari authored
View
4 xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
@@ -444,10 +444,10 @@ void CGUIWindowPVRRecordings::AfterUpdate(CFileItemList& items)
}
for (DirectoryMap::iterator it = directory_map.begin(); it != directory_map.end(); it++)
- CGUIWindowVideoNav::LoadVideoInfo(*it->second, m_database);
+ CGUIWindowVideoNav::LoadVideoInfo(*it->second, m_database, false);
}
else
- CGUIWindowVideoNav::LoadVideoInfo(files, m_database);
+ CGUIWindowVideoNav::LoadVideoInfo(files, m_database, false);
m_database.Close();
}
m_thumbLoader.Load(files);
View
4 xbmc/video/windows/GUIWindowVideoNav.cpp
@@ -394,7 +394,7 @@ void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items)
LoadVideoInfo(items, m_database);
}
-void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items, CVideoDatabase &database)
+void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items, CVideoDatabase &database, bool allowReplaceLabels)
{
// TODO: this could possibly be threaded as per the music info loading,
// we could also cache the info
@@ -421,7 +421,7 @@ void CGUIWindowVideoNav::LoadVideoInfo(CFileItemList &items, CVideoDatabase &dat
setting is enabled.
*/
const bool stackItems = items.GetProperty("isstacked").asBoolean() || (StackingAvailable(items) && g_settings.m_videoStacking);
- const bool replaceLabels = g_guiSettings.GetBool("myvideos.replacelabels");
+ const bool replaceLabels = allowReplaceLabels && g_guiSettings.GetBool("myvideos.replacelabels");
CFileItemList dbItems;
/* NOTE: In the future when GetItemsForPath returns all items regardless of whether they're "in the library"
View
3  xbmc/video/windows/GUIWindowVideoNav.h
@@ -44,8 +44,9 @@ class CGUIWindowVideoNav : public CGUIWindowVideoBase
Useful for grabbing information for file listings, from watched status to full metadata
\param items the items to load information for.
\param database open database object to retrieve the data from
+ \param allowReplaceLabels allow label replacement if according GUI setting is enabled
*/
- static void LoadVideoInfo(CFileItemList &items, CVideoDatabase &database);
+ static void LoadVideoInfo(CFileItemList &items, CVideoDatabase &database, bool allowReplaceLabels = true);
protected:
/*! \brief Load video information from the database for these items
Please sign in to comment.
Something went wrong with that request. Please try again.