starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-29 12:14:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

update search

Browse Source
This commit is contained in:
Luke Pulverenti
2015-09-23 22:31:40 -04:00
parent e429b42146
commit 4e90d73203
5 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -763,21 +763,24 @@ namespace MediaBrowser.Controller.Entities
/// <returns>IEnumerable{BaseItem}.</returns>
protected IEnumerable<BaseItem> GetCachedChildren()
{
var childrenItems = ItemRepository.GetChildrenItems(Id).Select(RetrieveChild).Where(i => i != null);
if (ConfigurationManager.Configuration.DisableStartupScan)
{
return ItemRepository.GetChildrenItems(Id).Select(RetrieveChild).Where(i => i != null);
//return ItemRepository.GetItems(new InternalItemsQuery
//{
// ParentId = Id
//var children = ItemRepository.GetChildren(Id).Select(RetrieveChild).Where(i => i != null).ToList();
//if (children.Count != childrenItems.Count)
//{
// var b = this;
//}
return childrenItems;
//}).Items.Select(RetrieveChild).Where(i => i != null);
}
else
{
return ItemRepository.GetChildrenItems(Id).Select(RetrieveChild).Where(i => i != null);
}
}
private BaseItem RetrieveChild(BaseItem child)
{
if (child.Id == Guid.Empty)
if (child == null || child.Id == Guid.Empty)
{
Logger.Error("Item found with empty Id: " + (child.Path ?? child.Name));
return null;