From: Marvin Schenkel <marvinschenkel@gmail.com>
Date: Thu, 6 Nov 2025 20:25:56 +0000 (+0100)
Subject: Fix deadlock when trying to join a paused Airplay player to a group (#2602)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=7351320e5d9ee967d17c5c751820845b81d0dd50;p=music-assistant-server.git

Fix deadlock when trying to join a paused Airplay player to a group (#2602)
---

diff --git a/music_assistant/providers/airplay/player.py b/music_assistant/providers/airplay/player.py
index 634ee59d..d32080c4 100644
--- a/music_assistant/providers/airplay/player.py
+++ b/music_assistant/providers/airplay/player.py
@@ -515,6 +515,12 @@ class AirPlayPlayer(Player):
             if child_player_to_add := cast(
                 "AirPlayPlayer | None", self.mass.players.get(player_id)
             ):
+                if (
+                    child_player_to_add.playback_state == PlaybackState.PAUSED
+                    and child_player_to_add.stream
+                ):
+                    # Stop the paused stream to avoid a deadlock situation
+                    await child_player_to_add.stream.stop()
                 if (
                     child_player_to_add.stream
                     and child_player_to_add.stream.running