From d2353781330a41dd710d4cb9da96105545b674c4 Mon Sep 17 00:00:00 2001
From: gnattu <gnattuoc@me.com>
Date: Sat, 1 Jun 2024 08:22:00 +0800
Subject: [PATCH] Query User on device creation

Signed-off-by: gnattu <gnattuoc@me.com>
---
 Jellyfin.Server.Implementations/Devices/DeviceManager.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
index 7bb0bb1bd..cb173e5fd 100644
--- a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
+++ b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
@@ -100,10 +100,13 @@ namespace Jellyfin.Server.Implementations.Devices
                 dbContext.Devices.Add(device);
 
                 await dbContext.SaveChangesAsync().ConfigureAwait(false);
+                var newDevice = await dbContext.Devices
+                    .Include(d => d.User)
+                    .FirstOrDefaultAsync(d => d.Id == device.Id)
+                    .ConfigureAwait(false);
+                _devices.Add(device.Id, newDevice!);
             }
 
-            _devices.Add(device.Id, device);
-
             return device;
         }