Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

zed: Don't let a second launch overwrite the session ID (#66364)

Som1e77078b3a29
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 78dad31e73e..391b202b453 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -348,11 +348,6 @@ fn main() {
let installation_id = app
.background_executor()
.spawn(installation_id(KeyValueStore::from_app_db(&app_db)));
- let session_id = Uuid::new_v4().to_string();
- let session = app.background_executor().spawn(Session::new(
- session_id.clone(),
- KeyValueStore::from_app_db(&app_db),
- ));
let background_executor = app.background_executor();
let (open_listener, mut open_rx) = OpenListener::new();
@@ -383,6 +378,12 @@ fn main() {
return;
}
+ let session_id = Uuid::new_v4().to_string();
+ let session = app.background_executor().spawn(Session::new(
+ session_id.clone(),
+ KeyValueStore::from_app_db(&app_db),
+ ));
+
let should_install_crash_handler =
client::telemetry::should_install_crash_handler(*release_channel::RELEASE_CHANNEL);