Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

forgot a lock

Browse Source
This commit is contained in:
ebr11 Eric Reed spam 2012-09-18 18:03:31 -04:00
parent 2c563ac92f
commit 442081f4e2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/Entities/Folder.cs
View File

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

2
MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
View File

@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.Resolvers
} }
else if (args.IsMetadataFolder) 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; resolve = false;
} }