diff options
| author | crobibero <cody@robibe.ro> | 2020-09-03 16:18:36 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-09-03 16:18:36 -0600 |
| commit | 21a5692626fa7389b4b37a91050496b2fe7a0260 (patch) | |
| tree | 910ca74c80542e574b91a2985aa248578e0abfe0 /Jellyfin.Server/Program.cs | |
| parent | 1feee6f95e00cf579ab16c7ca004947534545d9b (diff) | |
| parent | 1cbe4896e2ae0596cceb80f5b11e33dd2926b1f3 (diff) | |
Merge remote-tracking branch 'upstream/master' into api-doc-base-url
Diffstat (limited to 'Jellyfin.Server/Program.cs')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 223bb2558..45959aec2 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -11,7 +11,6 @@ using System.Threading; using System.Threading.Tasks; using CommandLine; using Emby.Server.Implementations; -using Emby.Server.Implementations.HttpServer; using Emby.Server.Implementations.IO; using Emby.Server.Implementations.Networking; using Jellyfin.Api.Controllers; @@ -28,6 +27,7 @@ using Microsoft.Extensions.Logging.Abstractions; using Serilog; using Serilog.Extensions.Logging; using SQLitePCL; +using ConfigurationExtensions = MediaBrowser.Controller.Extensions.ConfigurationExtensions; using ILogger = Microsoft.Extensions.Logging.ILogger; namespace Jellyfin.Server @@ -594,7 +594,7 @@ namespace Jellyfin.Server var inMemoryDefaultConfig = ConfigurationOptions.DefaultConfiguration; if (startupConfig != null && !startupConfig.HostWebClient()) { - inMemoryDefaultConfig[HttpListenerHost.DefaultRedirectKey] = "api-docs/swagger"; + inMemoryDefaultConfig[ConfigurationExtensions.DefaultRedirectKey] = "api-docs/swagger"; } return config |