From f1cce7ccaa581079398c213fdad066d87a856805 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 8 Dec 2021 16:16:28 -0500 Subject: [PATCH] Fix freeze after closing terminal on windows Signed-off-by: Sebastian Malton --- src/main/shell-session/shell-session.ts | 2 ++ src/renderer/api/terminal-api.ts | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/shell-session/shell-session.ts b/src/main/shell-session/shell-session.ts index b171986d56..677a637cc0 100644 --- a/src/main/shell-session/shell-session.ts +++ b/src/main/shell-session/shell-session.ts @@ -158,6 +158,8 @@ export abstract class ShellSession { cwd, env, name: "xterm-256color", + // TODO: Something else is broken here so we need to force the use of winPty on windows + useConpty: false, })); } diff --git a/src/renderer/api/terminal-api.ts b/src/renderer/api/terminal-api.ts index 8cca03538b..d57d410eaf 100644 --- a/src/renderer/api/terminal-api.ts +++ b/src/renderer/api/terminal-api.ts @@ -144,14 +144,6 @@ export class TerminalApi extends WebSocketApi { this.socket.binaryType = "arraybuffer"; } - destroy() { - if (!this.socket) return; - const controlCode = String.fromCharCode(4); // ctrl+d - - this.sendMessage({ type: TerminalChannels.STDIN, data: controlCode }); - setTimeout(() => super.destroy(), 2000); - } - reconnect() { super.reconnect(); }