diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-13 02:34:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-13 02:34:55 -0400 |
| commit | 9edd42c94cda3e2c025c01010da7f1d310903790 (patch) | |
| tree | b59bb33b1d3b549d4e6c8ada00bd9a2198004727 /MediaBrowser.Controller/Entities/Folder.cs | |
| parent | 3878da49a5323902a77c997fe5a409bfbc125c1c (diff) | |
| parent | c18b8ec608b44e04d17a1ef02a615b985ca00e7b (diff) | |
Merge pull request #2052 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index c1728ce38..bf04c643c 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -273,6 +273,7 @@ namespace MediaBrowser.Controller.Entities /// </summary> protected virtual IEnumerable<BaseItem> LoadChildren() { + //Logger.Debug("Loading children from {0} {1}", Id, Path); //just load our children from the repo - the library will be validated and maintained in other processes return GetCachedChildren(); } @@ -643,8 +644,9 @@ namespace MediaBrowser.Controller.Entities protected virtual IEnumerable<BaseItem> GetNonCachedChildren(IDirectoryService directoryService) { var collectionType = LibraryManager.GetContentType(this); + var libraryOptions = LibraryManager.GetLibraryOptions(this); - return LibraryManager.ResolvePaths(GetFileSystemChildren(directoryService), directoryService, this, collectionType); + return LibraryManager.ResolvePaths(GetFileSystemChildren(directoryService), directoryService, this, libraryOptions, collectionType); } /// <summary> |