diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-09-20 03:13:06 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-09-20 03:13:06 -0400 |
| commit | 07751895a18380b48e6cdfb2ad5b1bfc14cb5b5b (patch) | |
| tree | 7285698d1052a30b98d9f7edff7593ac323494e9 | |
| parent | 7cebc1f007df16305643887a2af07bfb247f8f91 (diff) | |
3.2.30.27
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveTvProgram.cs | 4 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 59f521eb5..713ece421 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -2206,17 +2206,19 @@ namespace Emby.Server.Implementations /// <returns>Task{CheckForUpdateResult}.</returns> public async Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, IProgress<double> progress) { - var cacheLength = TimeSpan.FromMinutes(5); var updateLevel = SystemUpdateLevel; + var cacheLength = updateLevel == PackageVersionClass.Release ? + TimeSpan.FromHours(4) : + TimeSpan.FromMinutes(5); - var result = await new GithubUpdater(HttpClient, JsonSerializer).CheckForUpdateResult("MediaBrowser", - "Emby", - ApplicationVersion, + var result = await new GithubUpdater(HttpClient, JsonSerializer).CheckForUpdateResult("MediaBrowser", + "Emby", + ApplicationVersion, updateLevel, ReleaseAssetFilename, "MBServer", - UpdateTargetFileName, - cacheLength, + UpdateTargetFileName, + cacheLength, cancellationToken).ConfigureAwait(false); HasUpdateAvailable = result.IsUpdateAvailable; diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs index 5449e59a2..1c1637330 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs @@ -50,7 +50,9 @@ namespace MediaBrowser.Controller.LiveTv public static double? GetDefaultPrimaryImageAspectRatio(IHasProgramAttributes item) { var serviceName = item.ServiceName; - if (!item.IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase)) + if (!item.IsMovie + && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) + && !string.Equals(serviceName, "Next Pvr", StringComparison.OrdinalIgnoreCase)) { double value = 16; value /= 9; diff --git a/SharedVersion.cs b/SharedVersion.cs index 016e036f8..841d2968c 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.30.26")] +[assembly: AssemblyVersion("3.2.30.27")] |