From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Mon, 27 Oct 2025 22:13:27 +0000 (+0100)
Subject: Attempt to fix the preload race condition in the queue
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=73aa4d225b1b79b112f4055cbf4c70a91d6a1e6c;p=music-assistant-server.git

Attempt to fix the preload race condition in the queue
---

diff --git a/music_assistant/controllers/player_queues.py b/music_assistant/controllers/player_queues.py
index 7e02f5a1..73835025 100644
--- a/music_assistant/controllers/player_queues.py
+++ b/music_assistant/controllers/player_queues.py
@@ -1241,17 +1241,11 @@ class PlayerQueuesController(CoreController):
         # without having to compare the entire list
         queue.items_last_updated = time.time()
         self.signal_update(queue_id, True)
-        if queue.state == PlaybackState.PLAYING and queue.index_in_buffer is not None:
+        if queue.state == PlaybackState.PLAYING and queue.index_in_buffer == queue.current_index:
             # if the queue is playing,
             # ensure to (re)queue the next track because it might have changed
-            if queue.next_item and queue.next_item == self.get_item(
-                queue_id, queue.index_in_buffer
-            ):
-                self.logger.warning(
-                    "Skipping enqueue of next item on queue %s, "
-                    "because the player has already loaded a different item in the buffer",
-                    self._queues[queue_id].display_name,
-                )
+            # note that we only do this if the player has loaded the current track
+            # if not, we wait until it has loaded to prevent conflicts
             if next_item := self.get_next_item(queue_id, queue.index_in_buffer):
                 self._enqueue_next_item(queue_id, next_item)
 
@@ -1614,6 +1608,14 @@ class PlayerQueuesController(CoreController):
                         break
                     retries -= 1
                     await asyncio.sleep(1)
+                if next_item := await self.load_next_queue_item(queue_id, item_id_in_buffer):
+                    self.logger.debug(
+                        "Preloaded next item %s for queue %s",
+                        next_item.name,
+                        queue.display_name,
+                    )
+                    # enqueue the next item on the player
+                    self._enqueue_next_item(queue_id, next_item)
 
             except QueueEmpty:
                 return