From a42399bcf33b9f06fcc163aeae1aedcde7600416 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 1 Jul 2022 14:36:51 +0200
Subject: [PATCH] Grab latest snapshot when invoking
 `LocalWorktree::poll_snapshot`

---
 crates/project/src/worktree.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs
index 97ba52a763..04c8cc4ad7 100644
--- a/crates/project/src/worktree.rs
+++ b/crates/project/src/worktree.rs
@@ -495,10 +495,10 @@ impl LocalWorktree {
     }
 
     fn poll_snapshot(&mut self, cx: &mut ModelContext<Worktree>) {
+        self.poll_task.take();
+        self.snapshot = self.background_snapshot.lock().clone();
         match self.scan_state() {
             ScanState::Idle => {
-                self.poll_task.take();
-                self.snapshot = self.background_snapshot.lock().clone();
                 if let Some(share) = self.share.as_mut() {
                     *share.snapshots_tx.borrow_mut() = self.snapshot.clone();
                 }
@@ -516,10 +516,7 @@ impl LocalWorktree {
                             smol::Timer::after(Duration::from_millis(100)).await;
                         }
                         if let Some(this) = this.upgrade(&cx) {
-                            this.update(&mut cx, |this, cx| {
-                                this.as_local_mut().unwrap().poll_task = None;
-                                this.poll_snapshot(cx);
-                            });
+                            this.update(&mut cx, |this, cx| this.poll_snapshot(cx));
                         }
                     }));
                 }