mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-11-03 19:17:24 -05:00 
			
		
		
		
	Use proper StartupCompleted flag
This commit is contained in:
		
							parent
							
								
									9a74ace84b
								
							
						
					
					
						commit
						db9bcdcdc9
					
				@ -120,6 +120,7 @@ namespace Emby.Server.Implementations
 | 
				
			|||||||
        private readonly INetworkManager _networkManager;
 | 
					        private readonly INetworkManager _networkManager;
 | 
				
			||||||
        private readonly IXmlSerializer _xmlSerializer;
 | 
					        private readonly IXmlSerializer _xmlSerializer;
 | 
				
			||||||
        private readonly IStartupOptions _startupOptions;
 | 
					        private readonly IStartupOptions _startupOptions;
 | 
				
			||||||
 | 
					        private readonly IConfigurationManager _configurationManager;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        private IMediaEncoder _mediaEncoder;
 | 
					        private IMediaEncoder _mediaEncoder;
 | 
				
			||||||
        private ISessionManager _sessionManager;
 | 
					        private ISessionManager _sessionManager;
 | 
				
			||||||
@ -240,16 +241,25 @@ namespace Emby.Server.Implementations
 | 
				
			|||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Initializes a new instance of the <see cref="ApplicationHost"/> class.
 | 
					        /// Initializes a new instance of the <see cref="ApplicationHost"/> class.
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        /// <param name="applicationPaths">Instance of the <see cref="IServerApplicationPaths"/> interface.</param>
 | 
				
			||||||
 | 
					        /// <param name="loggerFactory">Instance of the <see cref="ILoggerFactory"/> interface.</param>
 | 
				
			||||||
 | 
					        /// <param name="options">Instance of the <see cref="IStartupOptions"/> interface.</param>
 | 
				
			||||||
 | 
					        /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
 | 
				
			||||||
 | 
					        /// <param name="networkManager">Instance of the <see cref="INetworkManager"/> interface.</param>
 | 
				
			||||||
 | 
					        /// <param name="serviceCollection">Instance of the <see cref="IServiceCollection"/> interface.</param>
 | 
				
			||||||
 | 
					        /// <param name="configurationManager">Instance of the <see cref="ICollectionManager"/> interface.</param>
 | 
				
			||||||
        public ApplicationHost(
 | 
					        public ApplicationHost(
 | 
				
			||||||
            IServerApplicationPaths applicationPaths,
 | 
					            IServerApplicationPaths applicationPaths,
 | 
				
			||||||
            ILoggerFactory loggerFactory,
 | 
					            ILoggerFactory loggerFactory,
 | 
				
			||||||
            IStartupOptions options,
 | 
					            IStartupOptions options,
 | 
				
			||||||
            IFileSystem fileSystem,
 | 
					            IFileSystem fileSystem,
 | 
				
			||||||
            INetworkManager networkManager,
 | 
					            INetworkManager networkManager,
 | 
				
			||||||
            IServiceCollection serviceCollection)
 | 
					            IServiceCollection serviceCollection,
 | 
				
			||||||
 | 
					            IConfigurationManager configurationManager)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            _xmlSerializer = new MyXmlSerializer();
 | 
					            _xmlSerializer = new MyXmlSerializer();
 | 
				
			||||||
            ServiceCollection = serviceCollection;
 | 
					            ServiceCollection = serviceCollection;
 | 
				
			||||||
 | 
					            _configurationManager = configurationManager;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            _networkManager = networkManager;
 | 
					            _networkManager = networkManager;
 | 
				
			||||||
            networkManager.LocalSubnetsFn = GetConfiguredLocalSubnets;
 | 
					            networkManager.LocalSubnetsFn = GetConfiguredLocalSubnets;
 | 
				
			||||||
@ -1138,7 +1148,7 @@ namespace Emby.Server.Implementations
 | 
				
			|||||||
                OperatingSystem = OperatingSystem.Id.ToString(),
 | 
					                OperatingSystem = OperatingSystem.Id.ToString(),
 | 
				
			||||||
                ServerName = FriendlyName,
 | 
					                ServerName = FriendlyName,
 | 
				
			||||||
                LocalAddress = localAddress,
 | 
					                LocalAddress = localAddress,
 | 
				
			||||||
                StartupCompleted = CoreStartupHasCompleted
 | 
					                StartupCompleted = _configurationManager.CommonConfiguration.IsStartupWizardCompleted
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user