diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2021-03-15 09:06:15 +0100 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2021-03-21 19:10:13 -0400 |
| commit | ed15cb1571b2a1527e5bc6cb8ae0eff94fdfada6 (patch) | |
| tree | f5b7eb9cb72f868d4f8f13d2e45a0eee63fd67dc | |
| parent | c171bac71a65a5e6c18b80335f1c02cb446d7014 (diff) | |
Merge pull request #5475 from BaronGreenback/SSDPFix
(cherry picked from commit baa43c6b41a9b6ac1e6ceab79be4e298f3044d96)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
| -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); |