From 442081f4e20a2a0bb5a17023817754ef6045b5ee Mon Sep 17 00:00:00 2001
From: ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com>
Date: Tue, 18 Sep 2012 18:03:31 -0400
Subject: [PATCH] forgot a lock

---
 MediaBrowser.Controller/Entities/Folder.cs                  | 3 ++-
 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 249921f0fd..7d58e5e20b 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 043453bc09..ebb1f4103c 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;
             }