diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-04 15:48:31 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-04 15:48:31 -0400 |
| commit | c9345179db5ff8e3f681666ce063bb7a028fff84 (patch) | |
| tree | 116e7010ee6dc99437d3f1cb4fdd2119d26be77d /MediaBrowser.Controller/Entities/Folder.cs | |
| parent | fe2eb6cb01564662df01aef87afe2bff51971c1b (diff) | |
fix ambiguous method call
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index bcf62115c..fa72b5aba 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -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> |
