diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-20 13:45:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 13:45:57 -0400 |
| commit | 843f5bb8d177124fe25a694a08b35b0c5465aaad (patch) | |
| tree | b90a430eedfb2b41ee5df6177887000924839da2 | |
| parent | e35d9be8ad713af09105a9fd54d823c6bb54f35d (diff) | |
| parent | 8117d31d2f7a02d68232950ecf26c7c31efdbda3 (diff) | |
Merge pull request #2901 from MediaBrowser/master
master
| -rw-r--r-- | Emby.Server.Implementations/Dto/DtoService.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs index 1854829a2..c5fcc0e4c 100644 --- a/Emby.Server.Implementations/Dto/DtoService.cs +++ b/Emby.Server.Implementations/Dto/DtoService.cs @@ -571,7 +571,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/SharedVersion.cs b/SharedVersion.cs index 841d2968c..d2828ea18 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.30.27")] +[assembly: AssemblyVersion("3.2.31")] |