From 350983e03cc354e083cccdd156d3672cc7125685 Mon Sep 17 00:00:00 2001
From: timminator <150205162+timminator@users.noreply.github.com>
Date: Thu, 20 Mar 2025 14:10:48 +0100
Subject: Fix OnPlaybackStopped task erroring out (#13226)

---
 Emby.Server.Implementations/Session/SessionManager.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations/Session')

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 030da6f73e..df2acfc46c 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -343,6 +343,11 @@ namespace Emby.Server.Implementations.Session
         /// <returns>Task.</returns>
         private async Task UpdateNowPlayingItem(SessionInfo session, PlaybackProgressInfo info, BaseItem libraryItem, bool updateLastCheckInTime)
         {
+            if (session is null)
+            {
+               return;
+            }
+
             if (string.IsNullOrEmpty(info.MediaSourceId))
             {
                 info.MediaSourceId = info.ItemId.ToString("N", CultureInfo.InvariantCulture);
@@ -675,6 +680,11 @@ namespace Emby.Server.Implementations.Session
 
         private BaseItem GetNowPlayingItem(SessionInfo session, Guid itemId)
         {
+            if (session is null)
+            {
+                return null;
+            }
+
             var item = session.FullNowPlayingItem;
             if (item is not null && item.Id.Equals(itemId))
             {
@@ -794,7 +804,11 @@ namespace Emby.Server.Implementations.Session
 
             ArgumentNullException.ThrowIfNull(info);
 
-            var session = GetSession(info.SessionId);
+            var session = GetSession(info.SessionId, false);
+            if (session is null)
+            {
+                return;
+            }
 
             var libraryItem = info.ItemId.IsEmpty()
                 ? null
-- 
cgit v1.2.3