diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-08-18 12:10:11 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-08-18 12:10:11 (GMT) |
commit | 550a9b023e48189248ee04816b0c01f0f862bad8 (patch) | |
tree | db4fc39801b7fce8670ddf65f49d5f466976a7c8 /generic/tclIO.c | |
parent | a8cbd4663aea70a49bc56c61016e39bebd99eeae (diff) | |
parent | cb112714d6dc2adff4f7a31b2268de41a0fbb6bd (diff) | |
download | tcl-550a9b023e48189248ee04816b0c01f0f862bad8.zip tcl-550a9b023e48189248ee04816b0c01f0f862bad8.tar.gz tcl-550a9b023e48189248ee04816b0c01f0f862bad8.tar.bz2 |
Merge to feature branch
Diffstat (limited to 'generic/tclIO.c')
-rw-r--r-- | generic/tclIO.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 78c1dc0..a19fde8 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -414,8 +414,8 @@ TclFinalizeIOSubsystem(void) statePtr != NULL; statePtr = statePtr->nextCSPtr) { chanPtr = statePtr->topChanPtr; - if (!GotFlag(statePtr, CHANNEL_INCLOSE | CHANNEL_CLOSED | - CHANNEL_DEAD)) { + if (!GotFlag(statePtr, CHANNEL_INCLOSE | CHANNEL_CLOSED | CHANNEL_DEAD) + || GotFlag(statePtr, BG_FLUSH_SCHEDULED)) { active = 1; break; } @@ -458,6 +458,7 @@ TclFinalizeIOSubsystem(void) * The refcount is greater than zero, so flush the channel. */ + ResetFlag(statePtr, BG_FLUSH_SCHEDULED); Tcl_Flush((Tcl_Channel) chanPtr); /* |