cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

removed bad merge code

Browse Source
This commit is contained in:
BaronGreenback 2021-02-27 14:05:13 +00:00
parent a25e3c0256
commit d95ca20fc7
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Dlna/Main/DlnaEntryPoint.cs
View File

@ -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";

5
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -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)
{