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

1 files changed, 0 insertions, 8 deletions

diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index aa0c125cd..8eecebdbc 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -124,7 +124,6 @@ namespace MediaBrowser.Controller.Entities
         protected override Task ValidateChildrenInternal(IProgress<double> progress, CancellationToken cancellationToken, bool recursive, bool refreshChildMetadata, MetadataRefreshOptions refreshOptions, IDirectoryService directoryService)
         {
             CreateResolveArgs(directoryService);
-            ResetDynamicChildren();
 
             return NullTaskResult;
         }
@@ -150,8 +149,6 @@ namespace MediaBrowser.Controller.Entities
                 .ToList();
         }
 
-        private IEnumerable<BaseItem> _actualChildren;
-
         /// <summary>
         /// Our children are actually just references to the ones in the physical root...
         /// </summary>
@@ -170,10 +167,5 @@ namespace MediaBrowser.Controller.Entities
                 .SelectMany(c => c.Children)
                 .ToList();
         }
-
-        public void ResetDynamicChildren()
-        {
-            _actualChildren = null;
-        }
     }
 }