From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Thu, 22 May 2025 06:37:39 +0000 (+0200)
Subject: Add additional guard in get next item
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=e7d10281d00b1f8391654f4a066bf62e1bbd63eb;p=music-assistant-server.git

Add additional guard in get next item
---

diff --git a/music_assistant/controllers/player_queues.py b/music_assistant/controllers/player_queues.py
index e127309b..1c12bf7b 100644
--- a/music_assistant/controllers/player_queues.py
+++ b/music_assistant/controllers/player_queues.py
@@ -1495,6 +1495,8 @@ class PlayerQueuesController(CoreController):
         """Return next QueueItem for given queue."""
         if isinstance(cur_index, str):
             cur_index = self.index_by_id(queue_id, cur_index)
+        if cur_index is None:
+            return None  # guard
         for skip in range(5):
             if (next_index := self._get_next_index(queue_id, cur_index + skip)) is None:
                 break