diff options
| author | ericm <ericm> | 2000-07-25 22:41:05 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-07-25 22:41:05 (GMT) |
| commit | d54caded28afa2e06fa33552bc0dbe15e7a85689 (patch) | |
| tree | 0e0438578bff3e94e32c45079f88b3eb84ee81c3 /generic/tclVar.c | |
| parent | 4c98c418aec2da287ac86241a067c31770a1f176 (diff) | |
| download | tcl-d54caded28afa2e06fa33552bc0dbe15e7a85689.zip tcl-d54caded28afa2e06fa33552bc0dbe15e7a85689.tar.gz tcl-d54caded28afa2e06fa33552bc0dbe15e7a85689.tar.bz2 | |
* generic/tclVar.c (CallTraces): Added check for VAR_TRACE_ACTIVE
on the array containing the variable before executing traces on
that array, to conform with normal variable traces and the
documentation, which states that while executing a trace, other
traces on that variable are disabled. [Bug: 6049].
Diffstat (limited to 'generic/tclVar.c')
| -rw-r--r-- | generic/tclVar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c index 8147f45..8990ab8 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclVar.c,v 1.19 2000/06/01 00:33:27 hobbs Exp $ + * RCS: @(#) $Id: tclVar.c,v 1.20 2000/07/25 22:41:05 ericm Exp $ */ #include "tclInt.h" @@ -4190,7 +4190,7 @@ CallTraces(iPtr, arrayPtr, varPtr, part1, part2, flags) result = NULL; active.nextPtr = iPtr->activeTracePtr; iPtr->activeTracePtr = &active; - if (arrayPtr != NULL) { + if (arrayPtr != NULL && !(arrayPtr->flags & VAR_TRACE_ACTIVE)) { arrayPtr->refCount++; active.varPtr = arrayPtr; for (tracePtr = arrayPtr->tracePtr; tracePtr != NULL; |