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

Fix crash when attempting to show file prompt while using Japanese keyboard layout

Browse source
This commit is contained in:
Max Brunsfeld 2022-08-16 17:44:58 -07:00
parent 3f50d15f7c
commit e4eead6477
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/gpui/src/app.rs
View file

@ -344,7 +344,14 @@ impl WindowInputHandler {
where where
F: FnOnce(&dyn AnyView, &AppContext) -> T, F: FnOnce(&dyn AnyView, &AppContext) -> T,
{ {
let app = self.app.borrow(); // Input-related application hooks are sometimes called by the OS during
// a call to a window-manipulation API, like prompting the user for file
// paths. In that case, the AppContext will already be borrowed, so any
// InputHandler methods need to fail gracefully.
//
// See https://github.com/zed-industries/feedback/issues/444
let app = self.app.try_borrow().ok()?;
let view_id = app.focused_view_id(self.window_id)?; let view_id = app.focused_view_id(self.window_id)?;
let view = app.cx.views.get(&(self.window_id, view_id))?; let view = app.cx.views.get(&(self.window_id, view_id))?;
let result = f(view.as_ref(), &app); let result = f(view.as_ref(), &app);
@ -355,7 +362,7 @@ impl WindowInputHandler {
where where
F: FnOnce(usize, usize, &mut dyn AnyView, &mut MutableAppContext) -> T, F: FnOnce(usize, usize, &mut dyn AnyView, &mut MutableAppContext) -> T,
{ {
let mut app = self.app.borrow_mut(); let mut app = self.app.try_borrow_mut().ok()?;
app.update(|app| { app.update(|app| {
let view_id = app.focused_view_id(self.window_id)?; let view_id = app.focused_view_id(self.window_id)?;
let mut view = app.cx.views.remove(&(self.window_id, view_id))?; let mut view = app.cx.views.remove(&(self.window_id, view_id))?;