浏览代码

support trailers for episodes

Luke Pulverenti 9 年之前
父节点
当前提交
a8c11c0fd2
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      MediaBrowser.Server.Implementations/Library/LibraryManager.cs

+ 1 - 1
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();