Merge pull request #2943 from mark-monteiro/fix-browser-autolaunch

Respect AutoRunWebApp and NoAutoRunWebApp settings when HostWebClient is false

Emby.Server.Implementations/EntryPoints/StartupWizard.cs

@@ -32,30 +32,40 @@ namespace Emby.Server.Implementations.EntryPoints
         /// <inheritdoc />
         public Task RunAsync()
         {
-            if (!_appHost.CanLaunchWebBrowser)
-            {
+            Run();
             return Task.CompletedTask;
         }
 
-            if (!_appConfig.HostWebClient())
+        private void Run()
         {
-                BrowserLauncher.OpenSwaggerPage(_appHost);
+            if (!_appHost.CanLaunchWebBrowser)
+            {
+                return;
             }
-            else if (!_config.Configuration.IsStartupWizardCompleted)
+
+            // Always launch the startup wizard if possible when it has not been completed
+            if (!_config.Configuration.IsStartupWizardCompleted && _appConfig.HostWebClient())
             {
                 BrowserLauncher.OpenWebApp(_appHost);
+                return;
             }
-            else if (_config.Configuration.AutoRunWebApp)
-            {
+
+            // Do nothing if the web app is configured to not run automatically
             var options = ((ApplicationHost)_appHost).StartupOptions;
+            if (!_config.Configuration.AutoRunWebApp || options.NoAutoRunWebApp)
+            {
+                return;
+            }
 
-                if (!options.NoAutoRunWebApp)
+            // Launch the swagger page if the web client is not hosted, otherwise open the web client
+            if (_appConfig.HostWebClient())
             {
                 BrowserLauncher.OpenWebApp(_appHost);
             }
+            else
+            {
+                BrowserLauncher.OpenSwaggerPage(_appHost);
             }
-
-            return Task.CompletedTask;
         }
 
         /// <inheritdoc />