diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2020-02-14 01:16:52 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 01:16:52 +0900 |
| commit | cf2626428c0d4755662855fe6c3e4f439c909de9 (patch) | |
| tree | 2e22327724253510ae7a5cb3bc52e54ccf092536 | |
| parent | 407ba755f1ef257f476024157959e88e58f1d1f9 (diff) | |
| parent | f5db4c8402ffbbcd7a9837b9cecc01a74e778043 (diff) | |
Merge pull request #2400 from Bond-009/baseurl
Another baseurl related fix
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index e2df8877a..0837db251 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -1522,7 +1522,7 @@ namespace Emby.Server.Implementations string baseUrl = ServerConfigurationManager.Configuration.BaseUrl; if (baseUrl.Length != 0) { - url.Append('/').Append(baseUrl); + url.Append(baseUrl); } return url.ToString(); diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index f42aa2b44..5280d455c 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -165,6 +165,7 @@ namespace MediaBrowser.Model.Configuration public bool SkipDeserializationForBasicTypes { get; set; } public string ServerName { get; set; } + public string BaseUrl { get => _baseUrl; |