From 0b11192fe3cbcc81f48cf4c7e1321d2bd8598ed6 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 21 Sep 2021 11:58:31 +0200
Subject: [PATCH] Remove deadlock and make integration tests pass again

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

diff --git a/server/src/rpc.rs b/server/src/rpc.rs
index ec35a27c6f5cadfe24e0b6be0d0930a67f4d224e..5aae943b58d4b70018f2fb77ad1f0223e2795784 100644
--- a/server/src/rpc.rs
+++ b/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?;