syntaxAlchemist/lib-nested
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

list editor: fix deadlock

Browse source
This commit is contained in:
Michael Sippel 2023-08-07 07:40:49 +02:00
parent 3968baffe1
commit b220d264e4
Signed by: senvas
GPG key ID: F96CF119C34B64A6
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
nested/src/editors/list/pty_editor.rs
View file

@ -336,24 +336,34 @@ impl ObjCommander for PTYListController {
}, },
ListCursorMode::Select => { ListCursorMode::Select => {
if let Some(mut item) = e.get_item_mut() { if let Some(mut item) = e.get_item_mut() {
match item.write().unwrap().send_cmd_obj(cmd_obj.clone()) {
eprintln!("send cmd to child");
let mut i = item.write().unwrap();
let res = i.send_cmd_obj(cmd_obj.clone());
let close_char = i.close_char.get();
eprintln!("close char = {:?}", close_char);
drop(i);
drop(item);
eprintln!("back");
match res {
TreeNavResult::Continue => { TreeNavResult::Continue => {
TreeNavResult::Continue TreeNavResult::Continue
} }
TreeNavResult::Exit => { TreeNavResult::Exit => {
if cmd_type == char_type { if cmd_type == char_type {
eprintln!("char event event");
let co = cmd_obj.read().unwrap(); let co = cmd_obj.read().unwrap();
if let Some(cmd_view) = co.get_view::<dyn SingletonView<Item = char>>() { if let Some(cmd_view) = co.get_view::<dyn SingletonView<Item = char>>() {
drop(co); drop(co);
let c = cmd_view.get(); let c = cmd_view.get();
//eprintln!("close char = {:?}", item.close_char);
if Some(c) == self.split_char { if Some(c) == self.split_char {
e.listlist_split(); e.listlist_split();
TreeNavResult::Continue TreeNavResult::Continue
} else if Some(c) == item.read().unwrap().close_char.get() { } else if Some(c) == close_char {
//eprintln!("listedit: exit from select (close)"); //eprintln!("listedit: exit from select (close)");
//item.goto(TreeCursor::none()); //item.goto(TreeCursor::none());
e.cursor.set(ListCursor { e.cursor.set(ListCursor {