alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-17 15:46:22 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'master' into RemoteAccessFix

Browse Source
This commit is contained in:
BaronGreenback
2021-03-22 17:05:44 +00:00
committed by GitHub
parent 7fa525c83b 0853d1265c
commit 5d16d1f66d
174 changed files with 1361 additions and 1414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Common/Net/IPHost.cs
View File

@@ -406,7 +406,7 @@ namespace MediaBrowser.Common.Net
}
// If we haven't resolved before, or our timer has run out...
if ((_addresses.Length == 0 && !Resolved) || (DateTime.UtcNow > _lastResolved?.AddMinutes(Timeout)))
if ((_addresses.Length == 0 && !Resolved) || (DateTime.UtcNow > _lastResolved.Value.AddMinutes(Timeout)))
{
_lastResolved = DateTime.UtcNow;
ResolveHostInternal().GetAwaiter().GetResult();

6
MediaBrowser.Common/Net/IPNetAddress.cs
View File

@@ -216,11 +216,11 @@ namespace MediaBrowser.Common.Net
}
/// <inheritdoc/>
public override bool Equals(IPAddress address)
public override bool Equals(IPAddress ip)
{
if (address != null && !address.Equals(IPAddress.None) && !Address.Equals(IPAddress.None))
if (ip != null && !ip.Equals(IPAddress.None) && !Address.Equals(IPAddress.None))
{
return address.Equals(Address);
return ip.Equals(Address);
}
return false;