diff options
| author | Christopher Faylor <me@cgf.cx> | 2006-07-18 15:09:11 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2006-07-18 15:09:11 +0000 |
| commit | 8432b8b206cf898ac543aebea85c9e0b8494e8d0 (patch) | |
| tree | 6a676a69ca93d85a06445f738ed88701d9ab68ef /winsup | |
| parent | 62e9d4b96f5bc2aa1aa23361082e01297db32593 (diff) | |
| download | cygnal-8432b8b206cf898ac543aebea85c9e0b8494e8d0.tar.gz cygnal-8432b8b206cf898ac543aebea85c9e0b8494e8d0.tar.bz2 cygnal-8432b8b206cf898ac543aebea85c9e0b8494e8d0.zip | |
* tty.cc (tty_list::terminate): Don't enter the busy loop if we don't own the
master.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/tty.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a129776a1..cb1a29a9a 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2006-07-18 Christopher Faylor <cgf@timesys.com> + + * tty.cc (tty_list::terminate): Don't enter the busy loop if we don't + own the master. + 2006-07-18 Silvio Laguzzi <slaguzzi@data-al.de> * sec_acl.cc (acltotext32): Add missing handling of default ACL entry diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc index 018ffe08b..cfc4b086a 100644 --- a/winsup/cygwin/tty.cc +++ b/winsup/cygwin/tty.cc @@ -139,7 +139,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); |