From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Tue, 29 Apr 2025 07:43:04 +0000 (+0200)
Subject: Chore: Add guard for race condition
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=05f95fa6d959bf34fa569597a7b65d4a9035ac60;p=music-assistant-server.git

Chore: Add guard for race condition
---

diff --git a/music_assistant/controllers/player_queues.py b/music_assistant/controllers/player_queues.py
index 40c8c73e..0e097573 100644
--- a/music_assistant/controllers/player_queues.py
+++ b/music_assistant/controllers/player_queues.py
@@ -1558,6 +1558,8 @@ class PlayerQueuesController(CoreController):
                 # while the player is actually preloading the previously enqueued item.
                 retries = 120
                 while retries > 0:
+                    if not queue.current_item:
+                        return  # guard
                     if queue.current_item.queue_item_id == item_id_in_buffer:
                         break
                     retries -= 1