From c9345179db5ff8e3f681666ce063bb7a028fff84 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 4 Oct 2013 15:48:31 -0400
Subject: fix ambiguous method call

---
 MediaBrowser.Controller/Entities/Folder.cs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Controller/Entities')

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index bcf62115ce..fa72b5abac 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>
-- 
cgit v1.2.3