From bc40123891711d75b369ed4533817a359408438a Mon Sep 17 00:00:00 2001
From: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Date: Thu, 8 Jan 2026 20:43:35 -0800
Subject: [PATCH] fix(queue): use song serverId when switching servers

---
 src/renderer/components/item-image/item-image.tsx               | 2 ++
 .../item-list/item-table-list/columns/title-combined-column.tsx | 1 +
 .../features/player/components/full-screen-player-image.tsx     | 2 ++
 src/renderer/features/player/components/left-controls.tsx       | 1 +
 4 files changed, 6 insertions(+)

diff --git a/src/renderer/components/item-image/item-image.tsx b/src/renderer/components/item-image/item-image.tsx
index d141f56f8..810fe1fd3 100644
--- a/src/renderer/components/item-image/item-image.tsx
+++ b/src/renderer/components/item-image/item-image.tsx
@@ -36,6 +36,7 @@ const BaseItemImage = (
     props: Omit<ImageProps, 'id' | 'src'> & {
         id?: null | string;
         itemType: LibraryItem;
+        serverId?: null | string;
         src?: null | string;
         type?: keyof z.infer<typeof GeneralSettingsSchema>['imageRes'];
     },
@@ -46,6 +47,7 @@ const BaseItemImage = (
         id: props.id,
         imageUrl: src,
         itemType: props.itemType,
+        serverId: props.serverId || undefined,
         type: props.type,
     });
 
diff --git a/src/renderer/components/item-list/item-table-list/columns/title-combined-column.tsx b/src/renderer/components/item-list/item-table-list/columns/title-combined-column.tsx
index 7dd74a77f..a323841dd 100644
--- a/src/renderer/components/item-list/item-table-list/columns/title-combined-column.tsx
+++ b/src/renderer/components/item-list/item-table-list/columns/title-combined-column.tsx
@@ -238,6 +238,7 @@ export const QueueSongTitleCombinedColumn = (props: ItemTableListInnerColumn) =>
                         containerClassName={styles.image}
                         id={item?.imageId}
                         itemType={item?._itemType}
+                        serverId={item?._serverId}
                         src={item?.imageUrl}
                         type="table"
                     />
diff --git a/src/renderer/features/player/components/full-screen-player-image.tsx b/src/renderer/features/player/components/full-screen-player-image.tsx
index 29033b7ee..29793af00 100644
--- a/src/renderer/features/player/components/full-screen-player-image.tsx
+++ b/src/renderer/features/player/components/full-screen-player-image.tsx
@@ -85,12 +85,14 @@ export const FullScreenPlayerImage = () => {
     const currentImageUrl = useItemImageUrl({
         id: currentSong?.imageId || undefined,
         itemType: LibraryItem.SONG,
+        serverId: currentSong?._serverId,
         type: 'fullScreenPlayer',
     });
 
     const nextImageUrl = useItemImageUrl({
         id: nextSong?.imageId || undefined,
         itemType: LibraryItem.SONG,
+        serverId: nextSong?._serverId,
         type: 'fullScreenPlayer',
     });
 
diff --git a/src/renderer/features/player/components/left-controls.tsx b/src/renderer/features/player/components/left-controls.tsx
index bb9036a67..388ef26a7 100644
--- a/src/renderer/features/player/components/left-controls.tsx
+++ b/src/renderer/features/player/components/left-controls.tsx
@@ -124,6 +124,7 @@ export const LeftControls = () => {
                                         id={currentSong?.imageId}
                                         itemType={LibraryItem.SONG}
                                         loading="eager"
+                                        serverId={currentSong?._serverId}
                                         type="table"
                                     />
                                 </Tooltip>