aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Server.Startup.Common/ApplicationHost.cs')
-rw-r--r--MediaBrowser.Server.Startup.Common/ApplicationHost.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 70e903114..aeafc1ede 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -577,11 +577,20 @@ namespace MediaBrowser.Server.Startup.Common
}
catch (Exception ex)
{
- Logger.ErrorException("Error loading ImageMagick. Will revert to GDI.", ex);
+ Logger.Error("Error loading ImageMagick. Will revert to GDI.");
}
}
- return new GDIImageEncoder(FileSystemManager, LogManager.GetLogger("GDI"));
+ try
+ {
+ return new GDIImageEncoder(FileSystemManager, LogManager.GetLogger("GDI"));
+ }
+ catch (Exception ex)
+ {
+ Logger.Error("Error loading GDI. Will revert to NullImageEncoder.");
+ }
+
+ return new NullImageEncoder();
}
protected override INetworkManager CreateNetworkManager(ILogger logger)