Merge pull request #2677 from MediaBrowser/beta

Beta

1 files changed, 8 insertions, 21 deletions

diff --git a/MediaBrowser.ServerApplication/ImageEncoderHelper.cs b/MediaBrowser.ServerApplication/ImageEncoderHelper.cs
index b8fa097d6..a6651ea40 100644
--- a/MediaBrowser.ServerApplication/ImageEncoderHelper.cs
+++ b/MediaBrowser.ServerApplication/ImageEncoderHelper.cs
@@ -1,6 +1,5 @@
 using System;
 using Emby.Drawing;
-using Emby.Drawing.Net;
 using Emby.Drawing.ImageMagick;
 using Emby.Drawing.Skia;
 using Emby.Server.Core;
@@ -22,34 +21,22 @@ namespace MediaBrowser.Server.Startup.Common
             Func<IHttpClient> httpClient,
             IApplicationPaths appPaths)
         {
-            if (!startupOptions.ContainsOption("-enablegdi"))
+            try
             {
-                try
-                {
-                    return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem);
-                }
-                catch
-                {
-                    logger.Error("Error loading Skia. Will revert to ImageMagick.");
-                }
-
-                try
-                {
-                    return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
-                }
-                catch
-                {
-                    logger.Error("Error loading ImageMagick. Will revert to GDI.");
-                }
+                return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem);
+            }
+            catch
+            {
+                logger.Error("Error loading Skia. Will revert to ImageMagick.");
             }
 
             try
             {
-                return new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI"));
+                return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
             }
             catch
             {
-                logger.Error("Error loading GDI. Will revert to NullImageEncoder.");
+                logger.Error("Error loading ImageMagick. Will revert to GDI.");
             }
 
             return new NullImageEncoder();