From 185ce4867edcc6300fa5733576e39cd1b33ec0a1 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 18 Jul 2006 15:17:35 +0000 Subject: * tty.cc (tty_list::terminate): Don't enter the busy loop if we don't own the master. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/tty.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 275dde77e92..8dba361c16b 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2006-07-18 Christopher Faylor + + * tty.cc (tty_list::terminate): Don't enter the busy loop if we don't + own the master. + 2006-07-18 Silvio Laguzzi * sec_acl.cc (acltotext32): Add missing handling of default ACL entry diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc index f357b7bfb36..9793c8cc73a 100644 --- a/winsup/cygwin/tty.cc +++ b/winsup/cygwin/tty.cc @@ -145,7 +145,7 @@ tty_list::terminate () int ttynum = myself->ctty; /* Keep master running till there are connected clients */ - if (ttynum != -1 && ttys[ttynum].master_pid == myself->pid) + if (ttynum != -1 && tty_master && ttys[ttynum].master_pid == myself->pid) { tty *t = ttys + ttynum; CloseHandle (tty_master->from_master); -- cgit v1.2.1