Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-08 02:34:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5475 from BaronGreenback/SSDPFix

Browse Source 
(cherry picked from commit baa43c6b41a9b6ac1e6ceab79be4e298f3044d96)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Claus Vium 2021-03-15 09:06:15 +01:00 committed by Joshua M. Boniface
parent c171bac71a
commit ed15cb1571
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,8 @@ namespace Emby.Dlna.Main
_netConfig = config.GetConfiguration<NetworkConfiguration>("network"); _netConfig = config.GetConfiguration<NetworkConfiguration>("network");
_disabled = appHost.ListenWithHttps && _netConfig.RequireHttps; _disabled = appHost.ListenWithHttps && _netConfig.RequireHttps;
if (_disabled)
if (_disabled && _config.GetDlnaConfiguration().EnableServer)
{ {
_logger.LogError("The DLNA specification does not support HTTPS."); _logger.LogError("The DLNA specification does not support HTTPS.");
} }

2
Emby.Dlna/Ssdp/DeviceDiscovery.cs
View File

@ -69,7 +69,7 @@ namespace Emby.Dlna.Ssdp
{ {
lock (_syncLock) lock (_syncLock)
{ {
if (_listenerCount > 0 && _deviceLocator == null) if (_listenerCount > 0 && _deviceLocator == null && _commsServer != null)
{ {
_deviceLocator = new SsdpDeviceLocator(_commsServer); _deviceLocator = new SsdpDeviceLocator(_commsServer);