Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return error if subscribing to an entity that was already subscribed to

Browse source
This commit is contained in:
Antonio Scandurra 2023-04-06 14:42:19 +02:00
parent d7f56d6126
commit f995d07542
2 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/project/src/project.rs
View file

@ -463,7 +463,7 @@ impl Project {
) -> Result<ModelHandle<Self>> {
client.authenticate_and_connect(true, &cx).await?;
let subscription = client.subscribe_to_entity(remote_id);
let subscription = client.subscribe_to_entity(remote_id)?;
let response = client
.request_envelope(proto::JoinProject {
project_id: remote_id,
@ -989,6 +989,11 @@ impl Project {
if self.client_state.is_some() {
return Err(anyhow!("project was already shared"));
}
self.client_subscriptions.push(
self.client
.subscribe_to_entity(project_id)?
.set_model(&cx.handle(), &mut cx.to_async()),
);
for open_buffer in self.opened_buffers.values_mut() {
match open_buffer {
@ -1025,12 +1030,6 @@ impl Project {
.log_err();
}
self.client_subscriptions.push(
self.client
.subscribe_to_entity(project_id)
.set_model(&cx.handle(), &mut cx.to_async()),
);
let (metadata_changed_tx, mut metadata_changed_rx) = mpsc::unbounded();
self.client_state = Some(ProjectClientState::Local {
remote_id: project_id,