alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 14:28:46 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix ambiguous method call

Browse Source
This commit is contained in:
Luke Pulverenti
2013-10-04 15:48:31 -04:00
parent fe2eb6cb01
commit c9345179db
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1032,7 +1032,7 @@ namespace MediaBrowser.Controller.Entities
/// <exception cref="System.ArgumentNullException"></exception>
public IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
{
return GetRecursiveChildren(user, null, true);
return GetRecursiveChildren(user, null, includeLinkedChildren);
}
/// <summary>
@@ -1047,7 +1047,7 @@ namespace MediaBrowser.Controller.Entities
{
if (user == null)
{
throw new ArgumentNullException();
throw new ArgumentNullException("user");
}
var initialCount = _lastRecursiveCount == 0 ? _children.Count : _lastRecursiveCount;
@@ -1057,12 +1057,7 @@ namespace MediaBrowser.Controller.Entities
_lastRecursiveCount = list.Count;
if (includeLinkedChildren && hasLinkedChildren)
{
list = list.DistinctBy(i => i.Id).ToList();
}
return list;
return hasLinkedChildren ? list.DistinctBy(i => i.Id).ToList() : list;
}
/// <summary>
@@ -1071,7 +1066,7 @@ namespace MediaBrowser.Controller.Entities
/// <returns>IList{BaseItem}.</returns>
public IList<BaseItem> GetRecursiveChildren()
{
return GetRecursiveChildren(null);
return GetRecursiveChildren(null, null, true);
}
/// <summary>