Update to 3.5.2 and .net core 2.1

This commit is contained in:
stefan
2018-09-12 19:26:21 +02:00
parent c32d865638
commit 48facb797e
1419 changed files with 27525 additions and 88927 deletions

View File

@@ -1,5 +1,4 @@
using System;
using Emby.Server.Implementations.Browser;
using Emby.Server.Implementations.Browser;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Plugins;
using MediaBrowser.Model.Logging;
@@ -40,17 +39,17 @@ namespace Emby.Server.Implementations.EntryPoints
return;
}
if (_appHost.IsFirstRun)
if (!_config.Configuration.IsStartupWizardCompleted)
{
BrowserLauncher.OpenDashboardPage("wizardstart.html", _appHost);
BrowserLauncher.OpenWebApp(_appHost);
}
else if (_config.Configuration.IsStartupWizardCompleted && _config.Configuration.AutoRunWebApp)
else if (_config.Configuration.AutoRunWebApp)
{
var options = ((ApplicationHost)_appHost).StartupOptions;
if (!options.ContainsOption("-noautorunwebapp"))
{
BrowserLauncher.OpenDashboardPage("index.html", _appHost);
BrowserLauncher.OpenWebApp(_appHost);
}
}
}
@@ -60,7 +59,6 @@ namespace Emby.Server.Implementations.EntryPoints
/// </summary>
public void Dispose()
{
GC.SuppressFinalize(this);
}
}
}