diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-01 11:58:55 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-06-01 11:58:55 -0400 |
| commit | 16dac0f55b925b83c598ec2c55c40800166db521 (patch) | |
| tree | 4ace7cd76cfd4875ceb59417d8b0db86d3328adb /MediaBrowser.Server.Implementations/Library/LibraryManager.cs | |
| parent | b6f24399155ec9e9dc83f722b93778239f18dd33 (diff) | |
| parent | a8c11c0fd2c6517205e3b47a7ec63b825c1b85c8 (diff) | |
Merge pull request #1801 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 56d3bd4de..032f8dbb7 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -2309,7 +2309,7 @@ namespace MediaBrowser.Server.Implementations.Library public IEnumerable<Video> FindTrailers(BaseItem owner, List<FileSystemMetadata> fileSystemChildren, IDirectoryService directoryService) { - var files = fileSystemChildren.Where(i => i.IsDirectory) + var files = owner.IsInMixedFolder ? new List<FileSystemMetadata>() : fileSystemChildren.Where(i => i.IsDirectory) .Where(i => string.Equals(i.Name, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase)) .SelectMany(i => _fileSystem.GetFiles(i.FullName, false)) .ToList(); |