mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: don't quit yazi when blocking child takes the TTY

Browse source
This commit is contained in:
Alastair Scheuermann 2026-06-18 15:40:44 -06:00
parent 85132ff343
commit 73a0d7fc13
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yazi-term/src/source/unix.rs
View file

@ -49,7 +49,7 @@ impl<'a> EventSource<'a> {
// Stop waiting for events. // Stop waiting for events.
if wakeup_ready { if wakeup_ready {
while read_complete(&*self.waker, &mut [0u8; 1024])? != 0 {} while read_complete(&*self.waker, &mut [0u8; 1024])? != 0 {}
return Err(io::Error::from(io::ErrorKind::UnexpectedEof)); return Err(io::Error::from(io::ErrorKind::ConnectionAborted));
} }
// More input is ready. // More input is ready.

1
yazi-term/src/stream/stream.rs
View file

@ -33,6 +33,7 @@ impl EventStream {
} }
// try_poll() already handles Interrupted, this is defensive. // try_poll() already handles Interrupted, this is defensive.
Err(e) if e.kind() == io::ErrorKind::Interrupted => continue, Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
Err(e) if e.kind() == io::ErrorKind::ConnectionAborted => break,
Err(e) => { Err(e) => {
tx.send(Err(e)).ok(); tx.send(Err(e)).ok();
break; break;

22
yazi-tui/src/raterm.rs
View file

@ -97,16 +97,22 @@ impl Raterm {
let mut rx = self.stream.take().unwrap(); let mut rx = self.stream.take().unwrap();
tokio::spawn(async move { tokio::spawn(async move {
while let Some(Ok(event)) = rx.recv().await { loop {
match event { match rx.recv().await {
Event::Key(key) if key.kind != KeyEventKind::Press => continue, Some(Ok(event)) => match event {
Event::Mouse(mouse) if !YAZI.mgr.mouse_events.get().contains(mouse.kind.into()) => { Event::Key(key) if key.kind != KeyEventKind::Press => continue,
continue; Event::Mouse(mouse) if !YAZI.mgr.mouse_events.get().contains(mouse.kind.into()) => {
} continue;
_ => yazi_shared::event::Event::Term(event).emit(), }
_ => yazi_shared::event::Event::Term(event).emit(),
},
Some(Err(_)) => {
AppProxy::quit(Default::default());
break;
},
None => break,
} }
} }
AppProxy::quit(Default::default());
}); });
} }