summaryrefslogtreecommitdiffstats
path: root/generic/tclIORChan.c
diff options
context:
space:
mode:
authorgahr <gahr@gahr.ch>2016-04-04 11:25:12 (GMT)
committergahr <gahr@gahr.ch>2016-04-04 11:25:12 (GMT)
commit540521771129cfb3a851405ae4306448fea3e769 (patch)
tree75feaeff0a9a36b53252789c8aebb45dbc0b2e49 /generic/tclIORChan.c
parent4b301d844892c52ec5fecce47f03c91a551639ca (diff)
parentb4d78562f6e023b1bf1accc8649c1a93b14be8d6 (diff)
downloadtcl-540521771129cfb3a851405ae4306448fea3e769.zip
tcl-540521771129cfb3a851405ae4306448fea3e769.tar.gz
tcl-540521771129cfb3a851405ae4306448fea3e769.tar.bz2
merge trunktip_444
Diffstat (limited to 'generic/tclIORChan.c')
-rw-r--r--generic/tclIORChan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index 21c766e..f476a1a 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -1609,8 +1609,6 @@ ReflectWatch(
return;
}
- rcPtr->interest = mask;
-
/*
* Are we in the correct thread?
*/
@@ -1633,6 +1631,7 @@ ReflectWatch(
Tcl_Preserve(rcPtr);
+ rcPtr->interest = mask;
maskObj = DecodeEventMask(mask);
/* assert maskObj.refCount == 1 */
(void) InvokeTclMethod(rcPtr, METH_WATCH, maskObj, NULL, NULL);
@@ -3083,6 +3082,7 @@ ForwardProc(
/* assert maskObj.refCount == 1 */
Tcl_Preserve(rcPtr);
+ rcPtr->interest = paramPtr->watch.mask;
(void) InvokeTclMethod(rcPtr, METH_WATCH, maskObj, NULL, NULL);
Tcl_DecrRefCount(maskObj);
Tcl_Release(rcPtr);