Create ServiceController via DI instead of manual construction

1 files changed, 5 insertions, 3 deletions

diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index a3b61b98b..7a812f320 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -60,7 +60,8 @@ namespace Emby.Server.Implementations.HttpServer
             IJsonSerializer jsonSerializer,
             IXmlSerializer xmlSerializer,
             IHttpListener socketListener,
-            ILocalizationManager localizationManager)
+            ILocalizationManager localizationManager,
+            ServiceController serviceController)
         {
             _appHost = applicationHost;
             _logger = logger;
@@ -71,6 +72,8 @@ namespace Emby.Server.Implementations.HttpServer
             _jsonSerializer = jsonSerializer;
             _xmlSerializer = xmlSerializer;
             _socketListener = socketListener;
+            ServiceController = serviceController;
+
             _socketListener.WebSocketConnected = OnWebSocketConnected;
 
             _funcParseFn = t => s => JsvReader.GetParseFn(t)(s);
@@ -90,7 +93,7 @@ namespace Emby.Server.Implementations.HttpServer
 
         public string GlobalResponse { get; set; }
 
-        public ServiceController ServiceController { get; private set; }
+        public ServiceController ServiceController { get; }
 
         public object CreateInstance(Type type)
         {
@@ -601,7 +604,6 @@ namespace Emby.Server.Implementations.HttpServer
         {
             _webSocketListeners = listeners.ToArray();
             UrlPrefixes = urlPrefixes.ToArray();
-            ServiceController = new ServiceController();
 
             ServiceController.Init(this, serviceTypes);