diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-02-16 11:07:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 11:07:30 +0100 |
| commit | 86a4d15a32e70add34d9639d3cb6c2ce600456ef (patch) | |
| tree | 076f2dce5926cc23997100d94902eea1384e756e | |
| parent | b86f049e66545a5a7a67e4fa1086e4ef0f9b47fc (diff) | |
| parent | 7bb8985f11569905af4edbf4c47cba4d9b32c7ca (diff) | |
Merge pull request #899 from AThomsen/bugfix/dlna_name_race_condition
DLNA: Fix race condition leading to missing device names
| -rw-r--r-- | Emby.Dlna/PlayTo/PlayToManager.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Emby.Dlna/PlayTo/PlayToManager.cs b/Emby.Dlna/PlayTo/PlayToManager.cs index 6cce312ee..28e70d046 100644 --- a/Emby.Dlna/PlayTo/PlayToManager.cs +++ b/Emby.Dlna/PlayTo/PlayToManager.cs @@ -89,11 +89,6 @@ namespace Emby.Dlna.PlayTo return; } - if (_sessionManager.Sessions.Any(i => usn.IndexOf(i.DeviceId, StringComparison.OrdinalIgnoreCase) != -1)) - { - return; - } - var cancellationToken = _disposeCancellationTokenSource.Token; await _sessionLock.WaitAsync(cancellationToken).ConfigureAwait(false); @@ -105,6 +100,11 @@ namespace Emby.Dlna.PlayTo return; } + if (_sessionManager.Sessions.Any(i => usn.IndexOf(i.DeviceId, StringComparison.OrdinalIgnoreCase) != -1)) + { + return; + } + await AddDevice(info, location, cancellationToken).ConfigureAwait(false); } catch (OperationCanceledException) |