From bf0a7c374c9277bcf71e000c68e22a9c24c41744 Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Fri, 27 May 2022 15:58:31 -0600
Subject: [PATCH] Close live stream on session end

---
 Emby.Server.Implementations/Session/SessionManager.cs      | 6 +++++-
 Emby.Server.Implementations/Session/WebSocketController.cs | 4 ++--
 MediaBrowser.Controller/Session/ISessionManager.cs         | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 8c8d088b6a..eaf2c25daf 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -329,13 +329,17 @@ namespace Emby.Server.Implementations.Session
         }
 
         /// <inheritdoc />
-        public void CloseIfNeeded(SessionInfo session)
+        public async Task CloseIfNeededAsync(SessionInfo session)
         {
             if (!session.SessionControllers.Any(i => i.IsSessionActive))
             {
                 var key = GetSessionKey(session.Client, session.DeviceId);
 
                 _activeConnections.TryRemove(key, out _);
+                if (!string.IsNullOrEmpty(session.PlayState?.LiveStreamId))
+                {
+                    await _mediaSourceManager.CloseLiveStream(session.PlayState?.LiveStreamId).ConfigureAwait(false);
+                }
 
                 OnSessionEnded(session);
             }
diff --git a/Emby.Server.Implementations/Session/WebSocketController.cs b/Emby.Server.Implementations/Session/WebSocketController.cs
index 9fa92a53a1..d21b6a929c 100644
--- a/Emby.Server.Implementations/Session/WebSocketController.cs
+++ b/Emby.Server.Implementations/Session/WebSocketController.cs
@@ -53,13 +53,13 @@ namespace Emby.Server.Implementations.Session
             connection.Closed += OnConnectionClosed;
         }
 
-        private void OnConnectionClosed(object? sender, EventArgs e)
+        private async void OnConnectionClosed(object? sender, EventArgs e)
         {
             var connection = sender as IWebSocketConnection ?? throw new ArgumentException($"{nameof(sender)} is not of type {nameof(IWebSocketConnection)}", nameof(sender));
             _logger.LogDebug("Removing websocket from session {Session}", _session.Id);
             _sockets.Remove(connection);
             connection.Closed -= OnConnectionClosed;
-            _sessionManager.CloseIfNeeded(_session);
+            await _sessionManager.CloseIfNeededAsync(_session).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index c865560958..b16399598c 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -352,6 +352,6 @@ namespace MediaBrowser.Controller.Session
         /// <returns>Task.</returns>
         Task RevokeUserTokens(Guid userId, string currentAccessToken);
 
-        void CloseIfNeeded(SessionInfo session);
+        Task CloseIfNeededAsync(SessionInfo session);
     }
 }