Fix multiple (virtual) devices on the same host being merged.#3688
Merged
marcelveldt merged 1 commit intodevfrom Apr 14, 2026
Merged
Fix multiple (virtual) devices on the same host being merged.#3688marcelveldt merged 1 commit intodevfrom
marcelveldt merged 1 commit intodevfrom
Conversation
16 tasks
Contributor
There was a problem hiding this comment.
Pull request overview
Prevents universal players that represent multiple instances of the same protocol domain on a single host (same IP) from being merged together, addressing the “virtual devices on one host get merged” issue.
Changes:
- Add a merge guard in
_check_merge_universal_playersto skip merging when both universal players already have linked protocols from the same domain. - Add a regression test covering multiple squeezelite instances on the same IP with distinct MACs to ensure no merge occurs.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
music_assistant/controllers/players/protocol_linking.py |
Skips UP merge when both candidates share at least one linked protocol domain (prevents same-domain instance merging on shared IP). |
tests/core/test_protocol_linking.py |
Adds a regression test ensuring multiple same-domain protocol instances on one IP remain separate and keep their protocol links. |
marcelveldt
approved these changes
Apr 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Make sure that universal players with the same IP, but different MAC address do not get merged.
Related issue: music-assistant/support#5266