diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2021-03-15 09:06:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 09:06:15 +0100 |
| commit | baa43c6b41a9b6ac1e6ceab79be4e298f3044d96 (patch) | |
| tree | 9903494494d1e2b327b6dcbf08e7ac126e41039f | |
| parent | f2125da9f942e3972ce932bb20f6e83c2ece1e23 (diff) | |
| parent | 1723ed1604a5ab6ae4d8e4dc243118c3267d879d (diff) | |
Merge pull request #5475 from BaronGreenback/SSDPFix
| -rw-r--r-- | Emby.Dlna/Main/DlnaEntryPoint.cs | 3 | ||||
| -rw-r--r-- | Emby.Dlna/Ssdp/DeviceDiscovery.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs index 9a2d524d1..d3e9a41ec 100644 --- a/Emby.Dlna/Main/DlnaEntryPoint.cs +++ b/Emby.Dlna/Main/DlnaEntryPoint.cs @@ -128,7 +128,8 @@ namespace Emby.Dlna.Main _netConfig = config.GetConfiguration<NetworkConfiguration>("network"); _disabled = appHost.ListenWithHttps && _netConfig.RequireHttps; - if (_disabled) + + if (_disabled && _config.GetDlnaConfiguration().EnableServer) { _logger.LogError("The DLNA specification does not support HTTPS."); } diff --git a/Emby.Dlna/Ssdp/DeviceDiscovery.cs b/Emby.Dlna/Ssdp/DeviceDiscovery.cs index 8c7d961f3..d13871add 100644 --- a/Emby.Dlna/Ssdp/DeviceDiscovery.cs +++ b/Emby.Dlna/Ssdp/DeviceDiscovery.cs @@ -69,7 +69,7 @@ namespace Emby.Dlna.Ssdp { lock (_syncLock) { - if (_listenerCount > 0 && _deviceLocator == null) + if (_listenerCount > 0 && _deviceLocator == null && _commsServer != null) { _deviceLocator = new SsdpDeviceLocator(_commsServer); |
