From 75b07cc6c8639ec1ecd13d51938c91da3d76ac42 Mon Sep 17 00:00:00 2001
From: Kunal Mohan <kunalmohan99@gmail.com>
Date: Sat, 13 Feb 2021 15:57:31 +0530
Subject: [PATCH] Undo some changes

---
 src/common/mod.rs | 6 +++---
 src/server/mod.rs | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/common/mod.rs b/src/common/mod.rs
index 4e0eeec1..7ed80562 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -209,7 +209,7 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) {
     let send_app_instructions =
         SenderWithContext::new(SenderType::SyncSender(send_app_instructions));
 
-    let ipc_thread = start_server(
+    let pty_thread = start_server(
         os_input.clone(),
         opts.clone(),
         command_is_executing.clone(),
@@ -566,7 +566,7 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) {
             }
             AppInstruction::Error(backtrace) => {
                 let _ = send_server_instructions.send(ApiCommand::Quit);
-                let _ = ipc_thread.join();
+                let _ = pty_thread.join();
                 //IpcSenderWithContext::new().send(ApiCommand::Quit);
                 let _ = send_screen_instructions.send(ScreenInstruction::Quit);
                 let _ = screen_thread.join();
@@ -595,7 +595,7 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) {
     }
 
     let _ = send_server_instructions.send(ApiCommand::Quit);
-    let _ = ipc_thread.join().unwrap();
+    let _ = pty_thread.join().unwrap();
     //IpcSenderWithContext::new().send(ApiCommand::Quit);
     let _ = send_screen_instructions.send(ScreenInstruction::Quit);
     screen_thread.join().unwrap();
diff --git a/src/server/mod.rs b/src/server/mod.rs
index eb87753c..95fcd715 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -110,7 +110,7 @@ pub fn start_server(
 						command_is_executing.done_closing_pane();
 					}
 					PtyInstruction::Quit => {
-						//break;
+						break;
 					}
 				}
 			}
@@ -146,8 +146,6 @@ pub fn start_server(
 						}
 					}
 				}
-
-				//let _ = pty_thread.join();
 			}
 		})
 		.unwrap();
@@ -160,10 +158,10 @@ fn handle_stream(
 	mut stream: LocalSocketStream,
 	km: u32,
 ) {
-	//let mut reader = BufReader::new(stream);
+	let mut reader = BufReader::new(stream);
 	let mut buffer = [0; 65535]; // TODO: more accurate
 	loop {
-		let bytes = stream
+		let bytes = reader
 			.read(&mut buffer)
 			.expect("failed to parse ipc message");
 		let (mut err_ctx, decoded): (ErrorContext, ApiCommand) =