From daf0f435276be75ea2ef730ea7d53584e67d6557 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Wed, 21 Aug 2024 19:08:05 +0200 Subject: [PATCH] fix resume after pause --- music_assistant/server/controllers/player_queues.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/music_assistant/server/controllers/player_queues.py b/music_assistant/server/controllers/player_queues.py index e5404059..849ca12b 100644 --- a/music_assistant/server/controllers/player_queues.py +++ b/music_assistant/server/controllers/player_queues.py @@ -707,7 +707,9 @@ class PlayerQueuesController(CoreController): if resume_item is not None: resume_pos = resume_pos if resume_pos > 10 else 0 - fade_in = fade_in if fade_in is not None else resume_pos > 0 + queue_player = self.mass.players.get(queue_id) + if fade_in is None and not queue_player.powered: + fade_in = resume_pos > 0 if resume_item.media_type == MediaType.RADIO: # we're not able to skip in online radio so this is pointless resume_pos = 0 @@ -841,7 +843,7 @@ class PlayerQueuesController(CoreController): # queue is active and player has one of our tracks loaded, update state if item_id := self._parse_player_current_item_id(queue_id, player.current_item_id): queue.current_index = self.index_by_id(queue_id, item_id) - if player.state == PlayerState.PLAYING: + if player.state in (PlayerState.PLAYING, PlayerState.PAUSED): queue.elapsed_time = int(player.corrected_elapsed_time) queue.elapsed_time_last_updated = player.elapsed_time_last_updated -- 2.34.1