summaryrefslogtreecommitdiffstats
path: root/generic/tclIO.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-18 12:10:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-18 12:10:11 (GMT)
commit10598f2f671c67d379ac4871fcc173cf82cf41be (patch)
treedb4fc39801b7fce8670ddf65f49d5f466976a7c8 /generic/tclIO.c
parent2c11c7bfcca02de2a4b861913c1b6e13a4a7e102 (diff)
parent135891c9a942377b0c1a407a865ad167d1c248fb (diff)
downloadtcl-10598f2f671c67d379ac4871fcc173cf82cf41be.zip
tcl-10598f2f671c67d379ac4871fcc173cf82cf41be.tar.gz
tcl-10598f2f671c67d379ac4871fcc173cf82cf41be.tar.bz2
Merge to feature branch
Diffstat (limited to 'generic/tclIO.c')
-rw-r--r--generic/tclIO.c5
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);
/*