diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-08 02:02:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 02:02:22 -0500 |
| commit | 81467ebb342c8a251346f2b6769bec24476a7e39 (patch) | |
| tree | 8e7593786a822e2ce03de13fcdf10f2cc7a17658 /Emby.Server.Implementations | |
| parent | 82bb69213e00fc6ac72413aba58781e009b7a0b1 (diff) | |
| parent | 9383378e8150b3242c96f2dac6e77b1dc4568e6e (diff) | |
Merge pull request #2515 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/Dto/DtoService.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveTvManager.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs index e0df65b8e..147abd171 100644 --- a/Emby.Server.Implementations/Dto/DtoService.cs +++ b/Emby.Server.Implementations/Dto/DtoService.cs @@ -491,7 +491,7 @@ namespace Emby.Server.Implementations.Dto } } - if (!(item is LiveTvProgram) || fields.Contains(ItemFields.PlayAccess)) + //if (!(item is LiveTvProgram) || fields.Contains(ItemFields.PlayAccess)) { dto.PlayAccess = item.GetPlayAccess(user); } diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs index 654777b3c..618cd1d45 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs @@ -1596,6 +1596,7 @@ namespace Emby.Server.Implementations.LiveTv IsFolder = false, IsVirtualItem = false, Limit = query.Limit, + StartIndex = query.StartIndex, SortBy = new[] { ItemSortBy.DateCreated }, SortOrder = SortOrder.Descending, EnableTotalRecordCount = query.EnableTotalRecordCount, |