diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-05-10 22:01:37 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-05-10 22:01:37 (GMT) |
| commit | 307c5a0fa2285c18e4ee092dd2d8b4bf4a2bcbd7 (patch) | |
| tree | ec2746543e6f935b523c90c752b6140d6b77adb9 /generic/tclIO.c | |
| parent | 403ffb4d64fe122bdd4c84ea96f53e89b3b64b23 (diff) | |
| parent | 849b8b2b34ad47873dcc4d39009d5e3e3d20d875 (diff) | |
| download | tcl-307c5a0fa2285c18e4ee092dd2d8b4bf4a2bcbd7.zip tcl-307c5a0fa2285c18e4ee092dd2d8b4bf4a2bcbd7.tar.gz tcl-307c5a0fa2285c18e4ee092dd2d8b4bf4a2bcbd7.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index b06c14d..9e729c4 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -428,14 +428,15 @@ TclFinalizeIOSubsystem(void) statePtr = statePtr->nextCSPtr) { chanPtr = statePtr->topChanPtr; if (!GotFlag(statePtr, CHANNEL_INCLOSE | CHANNEL_CLOSED | CHANNEL_DEAD) - || (doflushnb && GotFlag(statePtr, BG_FLUSH_SCHEDULED))) { + || GotFlag(statePtr, BG_FLUSH_SCHEDULED)) { + ResetFlag(statePtr, BG_FLUSH_SCHEDULED); active = 1; break; } } /* - * We've found a live channel. Close it. + * We've found a live (or bg-closing) channel. Close it. */ if (active) { @@ -479,7 +480,6 @@ TclFinalizeIOSubsystem(void) * The refcount is greater than zero, so flush the channel. */ - ResetFlag(statePtr, BG_FLUSH_SCHEDULED); Tcl_Flush((Tcl_Channel) chanPtr); /* @@ -8760,7 +8760,7 @@ CreateScriptRecord( /* * Initialize the structure before calling Tcl_CreateChannelHandler, - * because a reflected channel caling 'chan postevent' aka + * because a reflected channel calling 'chan postevent' aka * 'Tcl_NotifyChannel' in its 'watch'Proc will invoke * 'TclChannelEventScriptInvoker' immediately, and we do not wish it to * see uninitialized memory and crash. See [Bug 2918110]. |