From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Thu, 6 Nov 2025 00:22:17 +0000 (+0100)
Subject: Small fix for source switching
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=42307b3441083f0a4a90c4d2d2b09552f0481879;p=music-assistant-server.git

Small fix for source switching
---

diff --git a/music_assistant/controllers/players/player_controller.py b/music_assistant/controllers/players/player_controller.py
index 319bc88e..7ab5abf4 100644
--- a/music_assistant/controllers/players/player_controller.py
+++ b/music_assistant/controllers/players/player_controller.py
@@ -2148,13 +2148,14 @@ class PlayerController(CoreController):
     ) -> None:
         """Handle playback/select of given plugin source on player."""
         plugin_source = plugin_prov.get_source()
-        if plugin_source.in_use_by and (current_player := self.get(plugin_source.in_use_by)):
+        if plugin_source.in_use_by and plugin_source.in_use_by != player.player_id:
             self.logger.debug(
                 "Plugin source %s is already in use by player %s, stopping playback there first.",
                 plugin_source.name,
-                current_player.display_name,
+                plugin_source.in_use_by,
             )
-            await self.cmd_stop(current_player.player_id)
+            with suppress(PlayerCommandFailed):
+                await self.cmd_stop(plugin_source.in_use_by)
         stream_url = await self.mass.streams.get_plugin_source_url(plugin_source, player.player_id)
         plugin_source.in_use_by = player.player_id
         # Call on_select callback if available