Cygwin: pty: Re-fix the last bug regarding nat-pipe.

Fixes: f907b5f405a3 ("Cygwin: pty: Fix failure to revert from nat-pipe in disable_pcon.")
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>

diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc
index 27a2c774a76c0edbd29669f9a8a75abf0574d57f..9d7ef3c9d167cd5edb161f3a857c22f18c57fc9b 100644 (file)
--- a/winsup/cygwin/fhandler/pty.cc
+++ b/winsup/cygwin/fhandler/pty.cc
@@ -4103,11 +4103,8 @@ fhandler_pty_slave::cleanup_for_non_cygwin_app (handle_set_t *p, tty *ttyp,
                                                DWORD force_switch_to)
 {
   ttyp->wait_fwd ();
-  DWORD current_pid = myself->exec_dwProcessId ?: myself->dwProcessId;
-  DWORD switch_to = force_switch_to;
   WaitForSingleObject (p->pipe_sw_mutex, INFINITE);
-  if (!switch_to)
-    switch_to = get_console_process_id (current_pid, false, true, true);
+  DWORD switch_to = get_winpid_to_hand_over (ttyp, force_switch_to);
   if ((!switch_to && (ttyp->pcon_activated || stdin_is_ptys))
       && ttyp->pty_input_state_eq (tty::to_nat))
     {