diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-25 14:24:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 14:24:37 -0400 |
| commit | 859a8f95877725c2aeafda3eb95776ff25fcdd75 (patch) | |
| tree | 69ecd6779af4bb3c9884c71783ed5ab7bd270e95 /Emby.Server.Implementations | |
| parent | a0dc26b88172f10efa6dbf0ff6c3dffd9733d097 (diff) | |
| parent | f13696868fd87924441a732e703350b56ae6ad7b (diff) | |
Merge pull request #2597 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations')
4 files changed, 6 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs index 7c0baf9c2..43a1e6e69 100644 --- a/Emby.Server.Implementations/Dto/DtoService.cs +++ b/Emby.Server.Implementations/Dto/DtoService.cs @@ -499,7 +499,7 @@ namespace Emby.Server.Implementations.Dto if (fields.Contains(ItemFields.BasicSyncInfo) || fields.Contains(ItemFields.SyncInfo)) { - var userCanSync = user != null && user.Policy.EnableSync; + var userCanSync = user != null && user.Policy.EnableContentDownloading; if (userCanSync && _syncManager.SupportsSync(item)) { dto.SupportsSync = true; diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs index 89b7198ca..c2ab0427d 100644 --- a/Emby.Server.Implementations/Library/UserManager.cs +++ b/Emby.Server.Implementations/Library/UserManager.cs @@ -942,7 +942,8 @@ namespace Emby.Server.Implementations.Library { return new UserPolicy { - EnableSync = true + EnableContentDownloading = true, + EnableSyncTranscoding = true }; } diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 5082f1b04..2fb35155d 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -422,7 +422,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV { if (!string.IsNullOrWhiteSpace(epgChannel.Name)) { - tunerChannel.Name = epgChannel.Name; + //tunerChannel.Name = epgChannel.Name; } if (!string.IsNullOrWhiteSpace(epgChannel.ImageUrl)) { diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index 0a2312735..de00cf239 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -715,7 +715,8 @@ namespace Emby.Server.Implementations.Session ClientName = session.Client, DeviceId = session.DeviceId, IsPaused = info.IsPaused, - PlaySessionId = info.PlaySessionId + PlaySessionId = info.PlaySessionId, + IsAutomated = isAutomated }, _logger); |