hasufell/neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix quit exception

Browse Source
This commit is contained in:
daa84 2016-05-05 16:48:21 +03:00
parent b1d5e3a36d
commit 1a0adf0a82
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui.rs
View File

@ -105,7 +105,7 @@ impl Ui {
let exit_image = Image::new_from_icon_name("application-exit", 50); let exit_image = Image::new_from_icon_name("application-exit", 50);
let exit_btn = ToolButton::new(Some(&exit_image), None); let exit_btn = ToolButton::new(Some(&exit_image), None);
exit_btn.connect_clicked(|_| gtk::main_quit()); exit_btn.connect_clicked(|_| quit());
button_bar.add(&exit_btn); button_bar.add(&exit_btn);
grid.attach(&button_bar, 0, 0, 1, 1); grid.attach(&button_bar, 0, 0, 1, 1);
@ -181,14 +181,18 @@ fn gtk_motion_notify(_: &DrawingArea, ev: &EventMotion) -> Inhibit {
Inhibit(false) Inhibit(false)
} }
fn gtk_delete(_: &Window, _: &Event) -> Inhibit { fn quit() {
UI.with(|ui_cell| { UI.with(|ui_cell| {
let mut ui = ui_cell.borrow_mut(); let mut ui = ui_cell.borrow_mut();
let nvim = ui.nvim(); let nvim = ui.nvim();
nvim.ui_detach().expect("Error in ui_detach"); nvim.ui_detach().expect("Error in ui_detach");
nvim.quit_no_save().expect("Can't stop nvim instance"); //nvim.quit_no_save().expect("Can't stop nvim instance");
}); });
gtk::main_quit(); gtk::main_quit();
}
fn gtk_delete(_: &Window, _: &Event) -> Inhibit {
quit();
Inhibit(false) Inhibit(false)
} }