Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 6 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index f862ce61b..eefce2fd3 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -538,8 +538,12 @@ namespace MediaBrowser.Controller.Entities
             var validChildren = new ConcurrentBag<Tuple<BaseItem, bool>>();
 
             cancellationToken.ThrowIfCancellationRequested();
-            
-            Parallel.ForEach(nonCachedChildren, child =>
+
+            var options = new ParallelOptions
+            {
+            };
+
+            Parallel.ForEach(nonCachedChildren, options, child =>
             {
                 BaseItem currentChild;