Remove deadlock and make integration tests pass again

Antonio Scandurra created 4 years ago

Change summary

server/src/rpc.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Detailed changes

server/src/rpc.rs

@@ -295,12 +295,12 @@ impl Server {
             .map(|entry| (entry.id, entry))
             .collect();
 
-        if let Some(collaborator_user_ids) =
+        let collaborator_user_ids =
             self.store
                 .write()
                 .await
-                .share_worktree(worktree.id, request.sender_id, entries)
-        {
+                .share_worktree(worktree.id, request.sender_id, entries);
+        if let Some(collaborator_user_ids) = collaborator_user_ids {
             self.peer
                 .respond(request.receipt(), proto::ShareWorktreeResponse {})
                 .await?;