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

Merge remote-tracking branch 'origin/main' into ownership-post

Browse source
This commit is contained in:
Nathan Sobo 2024-01-18 07:01:54 -07:00
commit 9e37232a13
21 changed files with 119 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/zed/src/main.rs
View file

@ -102,13 +102,15 @@ fn main() {
let open_listener = listener.clone();
app.on_open_urls(move |urls, _| open_listener.open_urls(&urls));
app.on_reopen(move |cx| {
if cx.has_global::<Weak<AppState>>() {
if let Some(app_state) = cx.global::<Weak<AppState>>().upgrade() {
workspace::open_new(&app_state, cx, |workspace, cx| {
Editor::new_file(workspace, &Default::default(), cx)
})
.detach();
}
if let Some(app_state) = cx
.try_global::<Weak<AppState>>()
.map(|app_state| app_state.upgrade())
.flatten()
{
workspace::open_new(&app_state, cx, |workspace, cx| {
Editor::new_file(workspace, &Default::default(), cx)
})
.detach();
}
});