diff options
| author | AmbulantRex <21176662+AmbulantRex@users.noreply.github.com> | 2023-04-15 07:11:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-15 07:11:33 -0600 |
| commit | 4a0b135b7a18ae27d0a11905d31d2ba621079225 (patch) | |
| tree | 3c10db9a166efae9e69f9f32cce5d86767523da5 /Emby.Server.Implementations/Session | |
| parent | 7dd4201971f1bb19ea380f2ca83aed11206cfe97 (diff) | |
| parent | c2b88f1852b16c2dde69b13c89feb34f78268057 (diff) | |
Merge branch 'jellyfin:master' into whitelist-dlls
Diffstat (limited to 'Emby.Server.Implementations/Session')
| -rw-r--r-- | Emby.Server.Implementations/Session/SessionManager.cs | 4 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Session/WebSocketController.cs | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index afa3721b88..5f6dc93fb3 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -606,7 +606,7 @@ namespace Emby.Server.Implementations.Session } catch (Exception ex) { - _logger.LogDebug("Error calling OnPlaybackStopped", ex); + _logger.LogDebug(ex, "Error calling OnPlaybackStopped"); } } @@ -953,7 +953,7 @@ namespace Emby.Server.Implementations.Session } catch (Exception ex) { - _logger.LogError("Error closing live stream", ex); + _logger.LogError(ex, "Error closing live stream"); } } diff --git a/Emby.Server.Implementations/Session/WebSocketController.cs b/Emby.Server.Implementations/Session/WebSocketController.cs index 051fa5b3cf..cdc736950e 100644 --- a/Emby.Server.Implementations/Session/WebSocketController.cs +++ b/Emby.Server.Implementations/Session/WebSocketController.cs @@ -69,9 +69,7 @@ namespace Emby.Server.Implementations.Session T data, CancellationToken cancellationToken) { - var socket = GetActiveSockets() - .OrderByDescending(i => i.LastActivityDate) - .FirstOrDefault(); + var socket = GetActiveSockets().MaxBy(i => i.LastActivityDate); if (socket is null) { |