From 6f3e890197b84bfecc99cc25e68f02e2af4f20e0 Mon Sep 17 00:00:00 2001 From: Joe Wilm Date: Tue, 7 Jun 2016 21:12:21 -0700 Subject: Handle pty char recv errors The main loop is now exitted if the char sender hangs up. --- src/main.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index faf397c5..98daddf1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -180,8 +180,12 @@ fn main() { } } - while let Ok(c) = chars_rx.try_recv() { - pty_parser.advance(&mut terminal, c); + loop { + match chars_rx.try_recv() { + Ok(c) => pty_parser.advance(&mut terminal, c), + Err(TryRecvError::Disconnected) => break 'main_loop, + Err(TryRecvError::Empty) => break, + } } unsafe { @@ -210,5 +214,7 @@ fn main() { window.swap_buffers().unwrap(); } + + // TODO handle child cleanup } -- cgit