From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Wed, 21 Aug 2024 19:37:14 +0000 (+0200)
Subject: attempt to fix track repeat on flow mode players
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=7c9bb92aa52c0ec250becdec972eec57a8398f61;p=music-assistant-server.git

attempt to fix track repeat on flow mode players
---

diff --git a/music_assistant/server/controllers/player_queues.py b/music_assistant/server/controllers/player_queues.py
index dcca2b3f..e4ebbe40 100644
--- a/music_assistant/server/controllers/player_queues.py
+++ b/music_assistant/server/controllers/player_queues.py
@@ -1218,12 +1218,16 @@ class PlayerQueuesController(CoreController):
         # player does not support enqueue next feature.
         # we wait for the player to stop after it reaches the end of the track
         if (
-            (not queue.flow_mode or queue.repeat_mode == RepeatMode.ALL)
+            (not queue.flow_mode or queue.repeat_mode in (RepeatMode.ALL, RepeatMode.ONE))
             # we have a couple of guards here to prevent the player starting
             # playback again when its stopped outside of MA's control
             and queue.stream_finished
             and queue.end_of_track_reached
             and queue.state == PlayerState.IDLE
+            and self._get_next_index(queue.queue_id, queue.current_index, allow_repeat=False)
+            is None
+            and self._get_next_index(queue.queue_id, queue.current_index, allow_repeat=True)
+            is not None
         ):
             queue.stream_finished = None
             self.mass.create_task(_enqueue_next(queue.current_index, False))