aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-08-06 00:38:48 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-08-06 00:38:48 -0400
commitd290a548456473ab40e5a6c8640c1c6e73df2e22 (patch)
tree238e0e9374d65129daabd439e6c2bacca899b45c /MediaBrowser.Server.Startup.Common/ApplicationHost.cs
parent319a956b3870e162b3072b52ea8c7310d5091bc6 (diff)
parentfec7c4782432edd38fdbdcca9234a93b5562181a (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
Diffstat (limited to 'MediaBrowser.Server.Startup.Common/ApplicationHost.cs')
-rw-r--r--MediaBrowser.Server.Startup.Common/ApplicationHost.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 3f1f98cd0..ce99f0a24 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -606,7 +606,7 @@ namespace MediaBrowser.Server.Startup.Common
{
return new ImageMagickEncoder(LogManager.GetLogger("ImageMagick"), ApplicationPaths, HttpClient, FileSystemManager, ServerConfigurationManager);
}
- catch (Exception ex)
+ catch
{
Logger.Error("Error loading ImageMagick. Will revert to GDI.");
}
@@ -616,7 +616,7 @@ namespace MediaBrowser.Server.Startup.Common
{
return new GDIImageEncoder(FileSystemManager, LogManager.GetLogger("GDI"));
}
- catch (Exception ex)
+ catch
{
Logger.Error("Error loading GDI. Will revert to NullImageEncoder.");
}
@@ -1412,7 +1412,7 @@ namespace MediaBrowser.Server.Startup.Common
{
return new Uri(externalDns).Host;
}
- catch (Exception e)
+ catch
{
return externalDns;
}