From 46b9ebd48e82883f6f0936c84331494d69dbacf5 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 8 Jun 2017 14:39:04 -0400 Subject: [PATCH] 3.2.19.6 --- .../Omdb/OmdbImageProvider.cs | 20 +++++++++++++++---- .../ImageEncoderHelper.cs | 16 +++++++-------- SharedVersion.cs | 2 +- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs index 98a7460535..04d2184722 100644 --- a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs +++ b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs @@ -54,11 +54,23 @@ namespace MediaBrowser.Providers.Omdb if (!string.IsNullOrEmpty(rootObject.Poster)) { - list.Add(new RemoteImageInfo + if (item is Episode) { - ProviderName = Name, - Url = string.Format("https://img.omdbapi.com/?i={0}&apikey=82e83907", imdbId) - }); + // img.omdbapi.com returning 404's + list.Add(new RemoteImageInfo + { + ProviderName = Name, + Url = rootObject.Poster + }); + } + else + { + list.Add(new RemoteImageInfo + { + ProviderName = Name, + Url = string.Format("https://img.omdbapi.com/?i={0}&apikey=82e83907", imdbId) + }); + } } } diff --git a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs index ee0c00065c..92eaf418be 100644 --- a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs +++ b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs @@ -23,14 +23,14 @@ namespace MediaBrowser.Server.Startup.Common { if (!startupOptions.ContainsOption("-enablegdi")) { - //try - //{ - // return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem); - //} - //catch - //{ - // logger.Error("Error loading Skia. Will revert to ImageMagick."); - //} + try + { + return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem); + } + catch + { + logger.Error("Error loading Skia. Will revert to ImageMagick."); + } try { diff --git a/SharedVersion.cs b/SharedVersion.cs index 917cf273a3..0bce33f9fa 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.19.5")] +[assembly: AssemblyVersion("3.2.19.6")]