aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-06-08 14:39:04 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-06-08 14:39:04 -0400
commit46b9ebd48e82883f6f0936c84331494d69dbacf5 (patch)
tree22881ef2b5f7141793ca12474a0aef112b18ffab
parent9544221b948ec0a4202f4f82a9b832c662321696 (diff)
3.2.19.6
-rw-r--r--MediaBrowser.Providers/Omdb/OmdbImageProvider.cs20
-rw-r--r--MediaBrowser.Server.Mono/ImageEncoderHelper.cs16
-rw-r--r--SharedVersion.cs2
3 files changed, 25 insertions, 13 deletions
diff --git a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
index 98a746053..04d218472 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 ee0c00065..92eaf418b 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 917cf273a..0bce33f9f 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")]