collab: Fix unable to rejoin shared project after leaving a call#50630
Merged
Anthony-Eid merged 1 commit intomainfrom Mar 3, 2026
Merged
collab: Fix unable to rejoin shared project after leaving a call#50630Anthony-Eid merged 1 commit intomainfrom
Anthony-Eid merged 1 commit intomainfrom
Conversation
This bug happened because downstream projects wouldn't clear their subscriptions when leaving a project,
tahayvr
pushed a commit
to tahayvr/zed
that referenced
this pull request
Mar 4, 2026
…-industries#50630) When a downstream project was disconnected from the host (e.g. the guest left the call), `disconnected_from_host_internal` did not clear `client_subscriptions`. These subscriptions hold entries in the `Client`'s entity subscription map, so a subsequent `join_remote_project` with the same project ID would fail with "already subscribed to entity". The fix adds `self.client_subscriptions.clear()` to `disconnected_from_host_internal`, matching what `unshare_internal` already does for the host side. Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects Release Notes: - collab: Fix unable to rejoin project bug ("already subscribed to entity")
wzulfikar
pushed a commit
to wzulfikar/zed
that referenced
this pull request
Mar 4, 2026
…-industries#50630) When a downstream project was disconnected from the host (e.g. the guest left the call), `disconnected_from_host_internal` did not clear `client_subscriptions`. These subscriptions hold entries in the `Client`'s entity subscription map, so a subsequent `join_remote_project` with the same project ID would fail with "already subscribed to entity". The fix adds `self.client_subscriptions.clear()` to `disconnected_from_host_internal`, matching what `unshare_internal` already does for the host side. Before you mark this PR as ready for review, make sure that you have: - [x] Added a solid test coverage and/or screenshots from doing manual testing - [x] Done a self-review taking into account security and performance aspects Release Notes: - collab: Fix unable to rejoin project bug ("already subscribed to entity")
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
1 participant
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.
When a downstream project was disconnected from the host (e.g. the guest left the call),
disconnected_from_host_internaldid not clearclient_subscriptions. These subscriptions hold entries in theClient's entity subscription map, so a subsequentjoin_remote_projectwith the same project ID would fail with "already subscribed to entity".The fix adds
self.client_subscriptions.clear()todisconnected_from_host_internal, matching whatunshare_internalalready does for the host side.Before you mark this PR as ready for review, make sure that you have:
Release Notes: