From ed15cb1571b2a1527e5bc6cb8ae0eff94fdfada6 Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Mon, 15 Mar 2021 09:06:15 +0100 Subject: [PATCH] Merge pull request #5475 from BaronGreenback/SSDPFix (cherry picked from commit baa43c6b41a9b6ac1e6ceab79be4e298f3044d96) Signed-off-by: Joshua M. Boniface --- Emby.Dlna/Main/DlnaEntryPoint.cs | 3 ++- 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 9a2d524d16..d3e9a41ec4 100644 --- a/Emby.Dlna/Main/DlnaEntryPoint.cs +++ b/Emby.Dlna/Main/DlnaEntryPoint.cs @@ -128,7 +128,8 @@ namespace Emby.Dlna.Main _netConfig = config.GetConfiguration("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 8c7d961f3e..d13871add8 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);