aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
diff options
context:
space:
mode:
authorAndrew Rabert <6550543+nvllsvm@users.noreply.github.com>2019-08-27 19:02:05 -0400
committerGitHub <noreply@github.com>2019-08-27 19:02:05 -0400
commit24775f49885ea6dc9a7de2200ee0de8f84918dd9 (patch)
tree697f16e945b8fd37d505426b386586f9e360d7de /MediaBrowser.Api/UserLibrary/UserLibraryService.cs
parentf255788383dead8f172c9e585bc589247164382f (diff)
parentfdc24ec2eeffec4334c705631439de72cf6c8bdd (diff)
Merge pull request #1651 from sl1288/master
Fix local trailers playback
Diffstat (limited to 'MediaBrowser.Api/UserLibrary/UserLibraryService.cs')
-rw-r--r--MediaBrowser.Api/UserLibrary/UserLibraryService.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index a9b06095d..6eaa1b692 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -366,11 +366,13 @@ namespace MediaBrowser.Api.UserLibrary
var dtoOptions = GetDtoOptions(_authContext, request);
- var dtos = item.GetExtras(new[] { ExtraType.Trailer })
- .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item))
- .ToArray();
+ var dtosExtras = item.GetExtras(new[] { ExtraType.Trailer })
+ .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item));
+
+ var dtosTrailers = item.GetTrailers()
+ .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item));
- return ToOptimizedResult(dtos);
+ return ToOptimizedResult(dtosExtras.Concat(dtosTrailers).ToArray());
}
/// <summary>