Browse Source

forgot a lock

ebr11 Eric Reed spam 12 years ago
parent
commit
442081f4e2

+ 2 - 1
MediaBrowser.Controller/Entities/Folder.cs

@@ -303,7 +303,8 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         public IEnumerable<BaseItem> GetChildren(User user)
         {
-            return ActualChildren.Where(c => c.IsParentalAllowed(user));
+            lock(childLock)
+                return ActualChildren.Where(c => c.IsParentalAllowed(user));
         }
 
         /// <summary>

+ 1 - 1
MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs

@@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.Resolvers
             }
             else if (args.IsMetadataFolder)
             {
-                // Don't retrieve these children here - we'll get them in the season resolver
+                // I think this is redundant, but...
                 resolve = false;
             }