aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBond_009 <Bond.009@outlook.com>2020-02-12 20:57:34 +0100
committerBond_009 <Bond.009@outlook.com>2020-02-12 20:57:34 +0100
commitf5db4c8402ffbbcd7a9837b9cecc01a74e778043 (patch)
tree9d2e15386ceeab17e29b0582cf63f2d8bf9d267b
parent662e1164c916098fd39469569c64f88126bedc65 (diff)
Another baseurl related fix
Baseurl always starts with a '/' (unless it's empty)
-rw-r--r--Emby.Server.Implementations/ApplicationHost.cs2
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs1
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;