diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2021-02-27 14:05:13 +0000 |
|---|---|---|
| committer | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2021-02-27 14:05:13 +0000 |
| commit | d95ca20fc731cf51e060c7ba6802821b6dd8c48f (patch) | |
| tree | ee1270d8de62e6cd4399e53376c77051a0438715 | |
| parent | a25e3c02568b5632278e23d6168efa927b29eda9 (diff) | |
removed bad merge code
| -rw-r--r-- | Emby.Dlna/Main/DlnaEntryPoint.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs index 2652e6245..797045857 100644 --- a/Emby.Dlna/Main/DlnaEntryPoint.cs +++ b/Emby.Dlna/Main/DlnaEntryPoint.cs @@ -313,7 +313,7 @@ namespace Emby.Dlna.Main _logger.LogInformation("Registering publisher for {0} on {1}", fullService, address); var uri = new UriBuilder(_appHost.GetSmartApiUrl(address.Address) + descriptorUri); - if (string.IsNullOrEmpty(_appHost.PublishedServerUrl)) + if (_appHost.PublishedServerUrl == null) { // DLNA will only work over http, so we must reset to http:// : {port}. uri.Scheme = "http"; diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 604f69986..56aa5a007 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -1146,11 +1146,6 @@ namespace Emby.Server.Implementations /// <inheritdoc/> public bool ListenWithHttps => Certificate != null && ServerConfigurationManager.GetNetworkConfiguration().EnableHttps; - public string GetStartupOption(string propName) - { - return _startupOptions.GetType().GetProperty(propName).GetValue(src, null); - } - /// <inheritdoc/> public string GetSmartApiUrl(IPAddress ipAddress, int? port = null) { |