From f09d2650548e69d4b4ff41a60b97aa11afb5fbf9 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 5 Jul 2022 17:54:54 +0200
Subject: [PATCH] Remove non-determinism from autosave after delay

---
 crates/editor/src/editor.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index f6d62a3c83..b601044e55 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -5596,9 +5596,9 @@ impl Editor {
                             .timer(Duration::from_millis(milliseconds))
                             .fuse();
                         pending_autosave.await;
-                        futures::select! {
-                            _ = timer => {}
+                        futures::select_biased! {
                             _ = cancel_rx => return None,
+                            _ = timer => {}
                         }
 
                         this.upgrade(&cx)?