aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication/ApplicationHost.cs
diff options
context:
space:
mode:
authortikuf <admin@nyalindee.com>2014-03-25 16:09:30 +1100
committertikuf <admin@nyalindee.com>2014-03-25 16:09:30 +1100
commit520b77a098a5f3755c098636821a7ff3742a055f (patch)
treeb347c31d1333520350422c3e3a08cea292fc8093 /MediaBrowser.ServerApplication/ApplicationHost.cs
parent72bd678b9736ed0cdd8afea90e7e0c91c5b9b4c9 (diff)
parenta94a98dc6c1381c177a407139769e0cad566346b (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')
-rw-r--r--MediaBrowser.ServerApplication/ApplicationHost.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 879fbc1b6..e49244edf 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -266,7 +266,7 @@ namespace MediaBrowser.ServerApplication
{
MigrateUserFolders();
}
- catch (IOException ex)
+ catch (IOException)
{
}
@@ -498,7 +498,7 @@ namespace MediaBrowser.ServerApplication
var appThemeManager = new AppThemeManager(ApplicationPaths, FileSystemManager, JsonSerializer, Logger);
RegisterSingleInstance<IAppThemeManager>(appThemeManager);
- var dlnaManager = new DlnaManager(XmlSerializer, FileSystemManager);
+ var dlnaManager = new DlnaManager(XmlSerializer, FileSystemManager, JsonSerializer);
RegisterSingleInstance<IDlnaManager>(dlnaManager);
var collectionManager = new CollectionManager(LibraryManager, FileSystemManager, LibraryMonitor);