From 29bad073ebeb10813c6468b6159ce3bd06398134 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Fri, 28 Feb 2020 20:49:04 +0100
Subject: Use config setting to decide if web content should be hosted

Also fail server startup if web content is expected but missing
---
 Emby.Server.Implementations/ApplicationHost.cs           | 5 +----
 Emby.Server.Implementations/EntryPoints/StartupWizard.cs | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 789b8724c3..8ea188724a 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -240,13 +240,10 @@ namespace Emby.Server.Implementations
         public int HttpsPort { get; private set; }
 
         /// <summary>
-        /// Gets the content root for the webhost. If the webhost is not serving static web content, this will be null.
+        /// Gets the content root for the webhost.
         /// </summary>
         public string ContentRoot { get; private set; }
 
-        /// <inheritdoc/>
-        public bool IsHostingContent => ContentRoot != null;
-
         /// <summary>
         /// Gets the server configuration manager.
         /// </summary>
diff --git a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
index 6b7e2805bd..7c2b3cd5f2 100644
--- a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
+++ b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
@@ -2,7 +2,9 @@ using System.Threading.Tasks;
 using Emby.Server.Implementations.Browser;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Controller.Plugins;
+using Microsoft.Extensions.Configuration;
 
 namespace Emby.Server.Implementations.EntryPoints
 {
@@ -36,7 +38,7 @@ namespace Emby.Server.Implementations.EntryPoints
                 return Task.CompletedTask;
             }
 
-            if (!_appHost.IsHostingContent)
+            if (_appHost.Resolve<IConfiguration>().IsNoWebContent())
             {
                 BrowserLauncher.OpenSwaggerPage(_appHost);
             }
-- 
cgit v1.2.3