aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKunal Mohan <kunalmohan99@gmail.com>2021-02-18 11:45:41 +0530
committerKunal Mohan <kunalmohan99@gmail.com>2021-05-04 20:47:49 +0530
commit831a02b9c0070f0e9bcec090d8fbd9d463456ace (patch)
tree2e77c8ad12130f5eaec1266d2974458658933299 /src
parentUse ipmpsc crate for IPC (diff)
downloadsl0ppij-831a02b9c0070f0e9bcec090d8fbd9d463456ace.tar.gz
sl0ppij-831a02b9c0070f0e9bcec090d8fbd9d463456ace.tar.xz
sl0ppij-831a02b9c0070f0e9bcec090d8fbd9d463456ace.zip
ensure proper shutdown
Diffstat (limited to 'src')
-rw-r--r--src/common/mod.rs8
1 files 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";