From e4260134aa6bdb436373fdecfbde1e9262d15bc2 Mon Sep 17 00:00:00 2001 From: Joe Wilm Date: Fri, 11 Nov 2016 18:00:08 -0800 Subject: Fix alacritty shutdown when shell exits on macOS Readiness for the pty file descriptor will never be HUP or ERROR; the out-of-band flag raised by sigchld is used instead. Resolves #14. --- src/event_loop.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/event_loop.rs b/src/event_loop.rs index 9584e416..7c00dd36 100644 --- a/src/event_loop.rs +++ b/src/event_loop.rs @@ -263,6 +263,9 @@ impl EventLoop if kind.is_readable() { self.pty_read(&mut state, &mut buf); + if ::tty::process_should_exit() { + break 'event_loop; + } } if kind.is_writable() { @@ -289,8 +292,8 @@ impl EventLoop } } - self.poll.deregister(&self.rx).expect("deregister channel"); - self.poll.deregister(&fd).expect("deregister pty"); + let _ = self.poll.deregister(&self.rx); + let _ = self.poll.deregister(&fd); (self, state) }) -- cgit