alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:44:43 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'master' into register-services-correctly

Browse Source
This commit is contained in:
Bond-009
2020-04-22 14:25:31 +02:00
committed by Mark Monteiro
parent bc4e72b29b a85b1dcba6
commit d744d7d234
35 changed files with 289 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Emby.Server.Implementations/EntryPoints/StartupWizard.cs
View File

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