summaryrefslogtreecommitdiffstats
path: root/generic/tclNotify.c
diff options
context:
space:
mode:
authordonal.k.fellows@manchester.ac.uk <dkf>2013-11-19 13:02:05 (GMT)
committerdonal.k.fellows@manchester.ac.uk <dkf>2013-11-19 13:02:05 (GMT)
commit927d98cab8f8cacf83e56543eabcd38fb2ecdae8 (patch)
treec1d1a1ad7d27af149a257ef0eba6b35dea1f5057 /generic/tclNotify.c
parentfcf4c53ed773b5afb0ccb2517c5a3ba6ea45dc67 (diff)
parent0c64716c131bbc1609b9b539eab58b677b8ec8bc (diff)
downloadtcl-927d98cab8f8cacf83e56543eabcd38fb2ecdae8.zip
tcl-927d98cab8f8cacf83e56543eabcd38fb2ecdae8.tar.gz
tcl-927d98cab8f8cacf83e56543eabcd38fb2ecdae8.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclNotify.c')
-rw-r--r--generic/tclNotify.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/generic/tclNotify.c b/generic/tclNotify.c
index a6523fc..e76bca8 100644
--- a/generic/tclNotify.c
+++ b/generic/tclNotify.c
@@ -813,11 +813,7 @@ Tcl_SetMaxBlockTime(
*/
if (!tsdPtr->inTraversal) {
- if (tsdPtr->blockTimeSet) {
- Tcl_SetTimer(&tsdPtr->blockTime);
- } else {
- Tcl_SetTimer(NULL);
- }
+ Tcl_SetTimer(&tsdPtr->blockTime);
}
}