aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-03-25 00:59:49 -0400
committerLuke <luke.pulverenti@gmail.com>2015-03-25 00:59:49 -0400
commitaa079120059699f4778d80f55e68883d75d26b3a (patch)
tree90ef957908152d11333fde96b95d609309560bb2 /MediaBrowser.Server.Startup.Common/ApplicationHost.cs
parent9926be0d9de688c04065c916e44ada4177b38a80 (diff)
parent29b6ee4b6f336f08807a7ed7bdb22a1ef68269c0 (diff)
Merge pull request #1051 from MediaBrowser/dev
3.0.5557.20000 Beta
Diffstat (limited to 'MediaBrowser.Server.Startup.Common/ApplicationHost.cs')
-rw-r--r--MediaBrowser.Server.Startup.Common/ApplicationHost.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index f35317cd2..9a7f03341 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -381,8 +381,6 @@ namespace MediaBrowser.Server.Startup.Common
RegisterSingleInstance(ServerConfigurationManager);
- RegisterSingleInstance(NativeApp.GetProcessManager());
-
LocalizationManager = new LocalizationManager(ServerConfigurationManager, FileSystemManager, JsonSerializer);
RegisterSingleInstance(LocalizationManager);
@@ -432,7 +430,7 @@ namespace MediaBrowser.Server.Startup.Common
RegisterSingleInstance<ISearchEngine>(() => new SearchEngine(LogManager, LibraryManager, UserManager));
- HttpServer = ServerFactory.CreateServer(this, LogManager, "Media Browser", "web/index.html");
+ HttpServer = ServerFactory.CreateServer(this, LogManager, "Emby", "web/index.html");
RegisterSingleInstance(HttpServer, false);
progress.Report(10);