Merge pull request #16321 from WizardOfYendor1/fix/livetv-consumer-leak-negative-position-ticks

Fix live stream consumer leak on negative PositionTicks

1 files changed, 11 insertions, 4 deletions

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 582e8ce8dc..1782b53e10 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1021,15 +1021,22 @@ namespace Emby.Server.Implementations.Session
 
             ArgumentNullException.ThrowIfNull(info);
 
+            var session = GetSession(info.SessionId);
+
+            session.StopAutomaticProgress();
+
             if (info.PositionTicks.HasValue && info.PositionTicks.Value < 0)
             {
+                // Ensure live stream is cleaned up before throwing, to prevent tuner
+                // resource leaks when stalled clients report a negative PositionTicks.
+                if (!string.IsNullOrEmpty(info.LiveStreamId))
+                {
+                    await CloseLiveStreamIfNeededAsync(info.LiveStreamId, session.Id).ConfigureAwait(false);
+                }
+
                 throw new ArgumentOutOfRangeException(nameof(info), "The PlaybackStopInfo's PositionTicks was negative.");
             }
 
-            var session = GetSession(info.SessionId);
-
-            session.StopAutomaticProgress();
-
             var libraryItem = info.ItemId.IsEmpty()
                 ? null
                 : GetNowPlayingItem(session, info.ItemId);