From 831a02b9c0070f0e9bcec090d8fbd9d463456ace Mon Sep 17 00:00:00 2001
From: Kunal Mohan <kunalmohan99@gmail.com>
Date: Thu, 18 Feb 2021 11:45:41 +0530
Subject: [PATCH] ensure proper shutdown

---
 src/common/mod.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/mod.rs b/src/common/mod.rs
index 34249f86..7e7de23c 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -567,11 +567,11 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) {
             }
             AppInstruction::Error(backtrace) => {
                 let _ = send_server_instructions.send(ServerInstruction::Quit);
-                //let _ = ipc_thread.join();
                 let _ = send_screen_instructions.send(ScreenInstruction::Quit);
-                let _ = screen_thread.join();
                 let _ = send_plugin_instructions.send(PluginInstruction::Quit);
+                let _ = screen_thread.join();
                 let _ = wasm_thread.join();
+                let _ = ipc_thread.join();
                 os_input.unset_raw_mode(0);
                 let goto_start_of_last_line = format!("\u{1b}[{};{}H", full_screen_ws.rows, 1);
                 let error = format!("{}\n{}", goto_start_of_last_line, backtrace);
@@ -594,11 +594,11 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) {
     }
 
     let _ = send_server_instructions.send(ServerInstruction::Quit);
-    //let _ = ipc_thread.join().unwrap();
     let _ = send_screen_instructions.send(ScreenInstruction::Quit);
-    screen_thread.join().unwrap();
     let _ = send_plugin_instructions.send(PluginInstruction::Quit);
+    screen_thread.join().unwrap();
     wasm_thread.join().unwrap();
+    ipc_thread.join().unwrap();
 
     // cleanup();
     let reset_style = "\u{1b}[m";