Merge pull request #2739 from MediaBrowser/beta

Beta

1 files changed, 7 insertions, 5 deletions

diff --git a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs
index 92eaf418b..36f11a52b 100644
--- a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs
+++ b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs
@@ -9,6 +9,7 @@ using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using Emby.Drawing.Skia;
+using MediaBrowser.Model.System;
 
 namespace MediaBrowser.Server.Startup.Common
 {
@@ -19,7 +20,8 @@ namespace MediaBrowser.Server.Startup.Common
             IFileSystem fileSystem, 
             StartupOptions startupOptions, 
             Func<IHttpClient> httpClient,
-            IApplicationPaths appPaths)
+            IApplicationPaths appPaths,
+            IEnvironmentInfo environment)
         {
             if (!startupOptions.ContainsOption("-enablegdi"))
             {
@@ -27,18 +29,18 @@ namespace MediaBrowser.Server.Startup.Common
                 {
                     return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem);
                 }
-                catch
+                catch (Exception ex)
                 {
-                    logger.Error("Error loading Skia. Will revert to ImageMagick.");
+                    logger.Error("Skia not available. Will try next image processor. {0}", ex.Message);
                 }
 
                 try
                 {
-                    return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
+                    return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem, environment);
                 }
                 catch
                 {
-                    logger.Error("Error loading ImageMagick. Will revert to GDI.");
+                    logger.Error("ImageMagick not available. Will try next image processor.");
                 }
             }