diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-05-17 11:53:13 -0400 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-05-17 11:53:13 -0400 |
| commit | 584641a6f43fee18f65dc9c8abd24b88742922ce (patch) | |
| tree | c25da5ee2b3819281cf20a0f847a0c89fef10adb /MediaBrowser.ServerApplication/ApplicationHost.cs | |
| parent | 1b333d124487a49f221c4f09f259a1d1891c6b44 (diff) | |
| parent | da7af24fca3b2462b971dce595cfa5e548311cce (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index a35ac44ea..4dd24d98f 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -378,18 +378,15 @@ namespace MediaBrowser.ServerApplication RegisterServerWithAdministratorAccess(); } - Parallel.Invoke( + base.FindParts(); - () => base.FindParts(), + HttpServer.Init(GetExports<IRestfulService>(false)); - () => - { - HttpServer.Init(GetExports<IRestfulService>(false)); + ServerManager.AddWebSocketListeners(GetExports<IWebSocketListener>(false)); - ServerManager.AddWebSocketListeners(GetExports<IWebSocketListener>(false)); - - StartServer(true); - }, + StartServer(true); + + Parallel.Invoke( () => LibraryManager.AddParts(GetExports<IResolverIgnoreRule>(), GetExports<IVirtualFolderCreator>(), GetExports<IItemResolver>(), GetExports<IIntroProvider>(), GetExports<IBaseItemComparer>()), |