From 7ccef6068b6b97fc461b9d5354b646e8f6fd961f Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 24 Nov 2019 13:25:52 -0500 Subject: [PATCH] Merge pull request #2045 from Bond-009/baseurlfix2 Fix baseurl issues part 2 (cherry picked from commit db581c4d9b30693cfd16e1d2e4c3f802c50726e5) Signed-off-by: Joshua Boniface --- MediaBrowser.Api/BaseApiService.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index 3111055968..5f1f6c5b16 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -300,11 +300,13 @@ namespace MediaBrowser.Api string baseUrl = ApiEntryPoint.Instance.ConfigurationManager.Configuration.BaseUrl; // backwards compatibility - if (baseUrl.Length == 0 - && (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) - || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase))) + if (baseUrl.Length == 0) { - index++; + if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) + || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase)) + { + index++; + } } else if (string.Equals(first, baseUrl.Remove(0, 1))) {