Merge pull request #2694 from MediaBrowser/dev

Dev

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)
+                        });
+                    }
                 }
             }
 

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
                 {

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.19.5")]
+[assembly: AssemblyVersion("3.2.19.6")]