michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Minor fix

Browse Source
This commit is contained in:
ConfusedPolarBear 2020-04-23 23:44:15 -05:00
parent 387a07c6dd
commit 33390153fd
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs
View File

@ -135,7 +135,7 @@ namespace Emby.Server.Implementations.QuickConnect
/// <inheritdoc/> /// <inheritdoc/>
public QuickConnectResult TryConnect(string friendlyName) public QuickConnectResult TryConnect(string friendlyName)
{ {
ExpireRequests(true); ExpireRequests();
if (State != QuickConnectState.Active) if (State != QuickConnectState.Active)
{ {
@ -282,18 +282,17 @@ namespace Emby.Server.Implementations.QuickConnect
return string.Join(string.Empty, bytes.Select(x => x.ToString("x2", CultureInfo.InvariantCulture))); return string.Join(string.Empty, bytes.Select(x => x.ToString("x2", CultureInfo.InvariantCulture)));
} }
private void ExpireRequests(bool onlyCheckTime = false) private void ExpireRequests()
{ {
bool expireAll = false;
// check if quick connect should be deactivated // check if quick connect should be deactivated
if (TemporaryActivation && DateTime.Now > DateActivated.AddMinutes(10) && State == QuickConnectState.Active) if (TemporaryActivation && DateTime.Now > DateActivated.AddMinutes(10) && State == QuickConnectState.Active)
{ {
_logger.LogDebug("Quick connect time expired, deactivating"); _logger.LogDebug("Quick connect time expired, deactivating");
SetEnabled(QuickConnectState.Available); SetEnabled(QuickConnectState.Available);
} expireAll = true;
TemporaryActivation = false;
if (onlyCheckTime)
{
return;
} }
// expire stale connection requests // expire stale connection requests
@ -302,7 +301,7 @@ namespace Emby.Server.Implementations.QuickConnect
for (int i = 0; i < _currentRequests.Count; i++) for (int i = 0; i < _currentRequests.Count; i++)
{ {
if (DateTime.Now > values[i].DateAdded.AddMinutes(RequestExpiry)) if (DateTime.Now > values[i].DateAdded.AddMinutes(RequestExpiry) || expireAll)
{ {
delete.Add(values[i].Lookup); delete.Add(values[i].Lookup);
} }