From 8b1e82f31a7ecaade440b0694c0bbe5a843b48ac Mon Sep 17 00:00:00 2001
From: Joe Wilm <joe@jwilm.com>
Date: Wed, 8 Jun 2016 21:24:31 -0700
Subject: Fix shutdown deadlock

Calling ::std::process::exit() from the SIGCHLD handler would sometimes
deadlock some OpenGL internal shutdown procedure. To resolve this, a
flag was added that can be checked with `process_should_exit`.
---
 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 7c130bc4..94cc1bc1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,6 +44,7 @@ use grid::Grid;
 use term::Term;
 use meter::Meter;
 use util::thread;
+use tty::process_should_exit;
 
 #[derive(Debug, Eq, PartialEq, Copy, Clone, Default)]
 pub struct Rgb {
@@ -130,7 +131,7 @@ fn main() {
     }
 
     let (chars_tx, chars_rx) = ::std::sync::mpsc::channel();
-    thread::spawn_named("TTY Reader", move || {
+    let reader_thread = thread::spawn_named("TTY Reader", move || {
         for c in reader.chars() {
             let c = c.unwrap();
             chars_tx.send(c).unwrap();
@@ -219,8 +220,13 @@ fn main() {
 
             window.swap_buffers().unwrap();
         }
+
+        if process_should_exit() {
+            break;
+        }
     }
 
-    // TODO handle child cleanup
+    reader_thread.join();
+    println!("Goodbye");
 }
 
-- 
cgit