Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made the 'update zed to collaborate' button clickable

Browse source
This commit is contained in:
Mikayla Maki 2023-02-16 14:41:03 -08:00
parent 43f61ab413
commit 4ea7a24b93
4 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/zed/src/zed.rs
View file

@ -408,17 +408,19 @@ pub fn build_window_options(
}
fn restart(_: &Restart, cx: &mut gpui::MutableAppContext) {
let cli_process = dbg!(cx.platform().path_for_auxiliary_executable("cli"))
let cli_process = cx
.platform()
.path_for_auxiliary_executable("cli")
.log_err()
.and_then(|path| {
Command::new(path)
.args(["--restart-from", &format!("{}", dbg!(std::process::id()))])
.args(["--restart-from", &format!("{}", std::process::id())])
.spawn()
.log_err()
});
cx.spawn(|mut cx| async move {
let did_quit = dbg!(cx.update(quit).await?);
let did_quit = cx.update(quit).await?;
if !did_quit {
if let Some(mut cli_process) = cli_process {
cli_process.kill().log_err();
@ -467,7 +469,6 @@ fn quit(cx: &mut gpui::MutableAppContext) -> Task<Result<bool>> {
return Ok(false);
}
}
dbg!("about to quit");
cx.platform().quit();
anyhow::Ok(true)
})