Merge pull request #2057 from MediaBrowser/dev

Dev

1 files changed, 14 insertions, 14 deletions

diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs
index a62c67c4f..d043cba47 100644
--- a/MediaBrowser.Controller/Entities/UserRootFolder.cs
+++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs
@@ -18,20 +18,20 @@ namespace MediaBrowser.Controller.Entities
     {
         private List<Guid> _childrenIds = null;
         private readonly object _childIdsLock = new object();
-        //protected override IEnumerable<BaseItem> LoadChildren()
-        //{
-        //    lock (_childIdsLock)
-        //    {
-        //        if (_childrenIds == null)
-        //        {
-        //            var list = base.LoadChildren().ToList();
-        //            _childrenIds = list.Select(i => i.Id).ToList();
-        //            return list;
-        //        }
-
-        //        return _childrenIds.Select(LibraryManager.GetItemById).Where(i => i != null).ToList();
-        //    }
-        //}
+        protected override IEnumerable<BaseItem> LoadChildren()
+        {
+            lock (_childIdsLock)
+            {
+                if (_childrenIds == null)
+                {
+                    var list = base.LoadChildren().ToList();
+                    _childrenIds = list.Select(i => i.Id).ToList();
+                    return list;
+                }
+
+                return _childrenIds.Select(LibraryManager.GetItemById).Where(i => i != null).ToList();
+            }
+        }
 
         private void ResetCachedChildren()
         {