From d81fec6b7c20c67a4515a00d63a788abeea36307 Mon Sep 17 00:00:00 2001 From: JPVenson Date: Sun, 3 Nov 2024 10:55:50 -0500 Subject: [PATCH] Backport pull request #12915 from jellyfin/release-10.10.z Fixed possible NullReferenceException in SessionManager Original-merge: 3592c629e78e80c9d2fc9e368c5d61a11c1bf688 Merged-by: crobibero Backported-by: Joshua M. Boniface --- Emby.Server.Implementations/Session/SessionManager.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index 6a8ad2bdc5..fe2c3d24f6 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -1938,7 +1938,11 @@ namespace Emby.Server.Implementations.Session // Don't report acceleration type for non-admin users. result = result.Select(r => { - r.TranscodingInfo.HardwareAccelerationType = HardwareAccelerationType.none; + if (r.TranscodingInfo is not null) + { + r.TranscodingInfo.HardwareAccelerationType = HardwareAccelerationType.none; + } + return r; }); }