From 75b05ca1e6dce73c2d419dd83cbc5f9693688faa Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sat, 4 Apr 2020 14:41:03 -0400
Subject: Register and construct DtoService correctly

---
 Emby.Server.Implementations/ApplicationHost.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'Emby.Server.Implementations/ApplicationHost.cs')

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index e10627ad1..44056dc9e 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -271,10 +271,6 @@ namespace Emby.Server.Implementations
         /// <value>The provider manager.</value>
         private IProviderManager ProviderManager { get; set; }
 
-        
-
-        private IDtoService DtoService { get; set; }
-
         public IImageProcessor ImageProcessor { get; set; }
 
         /// <summary>
@@ -711,7 +707,7 @@ namespace Emby.Server.Implementations
                 XmlSerializer,
                 NetworkManager,
                 () => ImageProcessor,
-                () => DtoService,
+                Resolve<IDtoService>,
                 this,
                 JsonSerializer,
                 FileSystemManager,
@@ -766,8 +762,9 @@ namespace Emby.Server.Implementations
             ProviderManager = new ProviderManager(HttpClient, SubtitleManager, ServerConfigurationManager, LibraryMonitor, LoggerFactory, FileSystemManager, ApplicationPaths, () => LibraryManager, JsonSerializer);
             serviceCollection.AddSingleton(ProviderManager);
 
-            DtoService = new DtoService(LoggerFactory, LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ProviderManager, this, () => MediaSourceManager, () => _liveTvManager);
-            serviceCollection.AddSingleton(DtoService);
+            // TODO: Refactor to eliminate circular dependency here so Lazy<> isn't required
+            serviceCollection.AddTransient(provider => new Lazy<ILiveTvManager>(provider.GetRequiredService<ILiveTvManager>));
+            serviceCollection.AddSingleton<IDtoService, DtoService>();
 
             serviceCollection.AddSingleton<IChannelManager, ChannelManager>();
 
-- 
cgit v1.2.3