aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Session
diff options
context:
space:
mode:
authorJPVenson <github@jpb.email>2024-11-03 10:55:50 -0500
committerJoshua M. Boniface <joshua@boniface.me>2024-11-03 10:55:50 -0500
commitd81fec6b7c20c67a4515a00d63a788abeea36307 (patch)
tree5eb3c591c7040baa855fff662b7fbcd52adbb5c8 /Emby.Server.Implementations/Session
parent510312045a4af2bd0478b3f6542e2c4884fa5d57 (diff)
Backport pull request #12915 from jellyfin/release-10.10.z
Fixed possible NullReferenceException in SessionManager Original-merge: 3592c629e78e80c9d2fc9e368c5d61a11c1bf688 Merged-by: crobibero <cody@robibe.ro> Backported-by: Joshua M. Boniface <joshua@boniface.me>
Diffstat (limited to 'Emby.Server.Implementations/Session')
-rw-r--r--Emby.Server.Implementations/Session/SessionManager.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 6a8ad2bdc..fe2c3d24f 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;
});
}