Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-25 23:18:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Respect AutoRunWebApp and NoAutoRunWebApp settings when HostWebClient is false
This commit is contained in:
Bond-009 2020-04-22 13:02:45 +02:00 committed by GitHub
parent de328a46cd bd81825d2d
commit a85b1dcba6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Emby.Server.Implementations/EntryPoints/StartupWizard.cs
View file

@ -31,31 +31,41 @@ namespace Emby.Server.Implementations.EntryPoints
/// <inheritdoc /> /// <inheritdoc />
public Task RunAsync() public Task RunAsync()
{
Run();
return Task.CompletedTask;
}
private void Run()
{ {
if (!_appHost.CanLaunchWebBrowser) 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
var options = ((ApplicationHost)_appHost).StartupOptions;
if (!_config.Configuration.AutoRunWebApp || options.NoAutoRunWebApp)
{
return;
}
// Launch the swagger page if the web client is not hosted, otherwise open the web client
if (_appConfig.HostWebClient())
{ {
BrowserLauncher.OpenWebApp(_appHost); BrowserLauncher.OpenWebApp(_appHost);
} }
else if (_config.Configuration.AutoRunWebApp) else
{ {
var options = ((ApplicationHost)_appHost).StartupOptions; BrowserLauncher.OpenSwaggerPage(_appHost);
if (!options.NoAutoRunWebApp)
{
BrowserLauncher.OpenWebApp(_appHost);
}
} }
return Task.CompletedTask;
} }
/// <inheritdoc /> /// <inheritdoc />