diff options
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 249921f0f..7d58e5e20 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/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>
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index 043453bc0..ebb1f4103 100644 --- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs +++ b/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;
}
|