diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-24 09:37:44 -0700 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-24 09:37:44 -0700 |
| commit | 38a0af6e86d3bdf8794343b03d26659d4bf89093 (patch) | |
| tree | f3c92b89ae3e8a7e744ee13eb1b16139da690622 /MediaBrowser.ServerApplication/ApplicationHost.cs | |
| parent | 543ce24c1051d10b32c0dae5277ee37c27daceae (diff) | |
| parent | 501dedb13cd59dc2683ac4192cd11289bd304cfb (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 4 |
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); |
