From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 28 Dec 2025 08:31:09 +0000 (+0100)
Subject: Add 2 guards for queue missing after client disconnect (#2884)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=3995575a518affd3de0b78d90a7da894974d4ca7;p=music-assistant-server.git

Add 2 guards for queue missing after client disconnect (#2884)
---

diff --git a/music_assistant/controllers/player_queues.py b/music_assistant/controllers/player_queues.py
index 288c10af..efdb58fc 100644
--- a/music_assistant/controllers/player_queues.py
+++ b/music_assistant/controllers/player_queues.py
@@ -1377,7 +1377,8 @@ class PlayerQueuesController(CoreController):
         """Get queue item by index or item_id."""
         if item_id_or_index is None:
             return None
-        queue_items = self._queue_items[queue_id]
+        if (queue_items := self._queue_items.get(queue_id)) is None:
+            return None
         if isinstance(item_id_or_index, int) and len(queue_items) > item_id_or_index:
             return queue_items[item_id_or_index]
         if isinstance(item_id_or_index, str):
diff --git a/music_assistant/providers/sendspin/player.py b/music_assistant/providers/sendspin/player.py
index cf168cb0..c33a242f 100644
--- a/music_assistant/providers/sendspin/player.py
+++ b/music_assistant/providers/sendspin/player.py
@@ -544,6 +544,8 @@ class SendspinPlayer(Player):
 
     async def send_current_media_metadata(self) -> None:
         """Send the current media metadata to the sendspin group."""
+        if not self.available:
+            return
         current_media = self.current_media
         if current_media is None:
             return