From 92b576dcc1577e2484c9ce484baa54de3bb60a55 Mon Sep 17 00:00:00 2001 From: Takashi Yano Date: Mon, 9 May 2022 19:45:18 +0900 Subject: [PATCH] Cygwin: pty: Avoid script command crash in console. - Previously, script command sometimes crashes by Ctrl-C in Win 7 if it is running in console, and non-cygwin app is foreground. This patch fixes the issue. --- winsup/cygwin/fhandler_tty.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index bb18d139e..9dfc3c495 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -4184,8 +4184,7 @@ fhandler_pty_common::attach_console_temporarily (DWORD target_pid) { FreeConsole (); AttachConsole (target_pid); - init_console_handler (::cygheap->ctty - && ::cygheap->ctty->is_console ()); + init_console_handler (false); } return console_exists ? resume_pid : (DWORD) -1; } @@ -4200,8 +4199,7 @@ fhandler_pty_common::resume_from_temporarily_attach (DWORD resume_pid) if (console_exists) if (!resume_pid || !AttachConsole (resume_pid)) AttachConsole (ATTACH_PARENT_PROCESS); - init_console_handler (::cygheap->ctty - && ::cygheap->ctty->is_console ()); + init_console_handler (false); } release_attach_mutex (); }