From b33810534b85f96702035a54a4c661cc4d31d928 Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Wed, 15 Jan 2025 20:12:41 +0000
Subject: Applied review comments

---
 Emby.Server.Implementations/Library/UserDataManager.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'Emby.Server.Implementations/Library/UserDataManager.cs')

diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index 9b3a0c1f9..cc45f2fcb 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -146,8 +146,8 @@ namespace Emby.Server.Implementations.Library
             {
                 ItemId = itemId,
                 CustomDataKey = dto.Key,
-                Item = null!,
-                User = null!,
+                Item = null,
+                User = null,
                 AudioStreamIndex = dto.AudioStreamIndex,
                 IsFavorite = dto.IsFavorite,
                 LastPlayedDate = dto.LastPlayedDate,
@@ -181,7 +181,13 @@ namespace Emby.Server.Implementations.Library
         private UserItemData? GetUserData(User user, Guid itemId, List<string> keys)
         {
             var cacheKey = GetCacheKey(user.InternalId, itemId);
-            var data = GetUserDataInternal(user.Id, itemId, keys);
+
+            if (_userData.TryGetValue(cacheKey, out var data))
+            {
+                return data;
+            }
+
+            data = GetUserDataInternal(user.Id, itemId, keys);
 
             if (data is null)
             {
-- 
cgit v1.2.3