summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2014-01-22 19:33:03 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2014-01-22 19:33:03 (GMT)
commitd007f17bcd05bca0bcceafe9a712b0a1b3b3f020 (patch)
tree04b0ea5cbeac269f069831b264bb0d982ad5a2ec /generic
parent75c91591589708f766539aef319bfb7d80d7f0a8 (diff)
parent6e072443704a589149fea001df51f9870b78c323 (diff)
downloadtcl-d007f17bcd05bca0bcceafe9a712b0a1b3b3f020.zip
tcl-d007f17bcd05bca0bcceafe9a712b0a1b3b3f020.tar.gz
tcl-d007f17bcd05bca0bcceafe9a712b0a1b3b3f020.tar.bz2
improved tidy-up from branch
Diffstat (limited to 'generic')
-rw-r--r--generic/tclBasic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 1aea752..46b532b 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -8416,7 +8416,7 @@ TclNRYieldToObjCmd(
{
CoroutineData *corPtr = iPtr->execEnvPtr->corPtr;
Tcl_Obj *listPtr, *nsObjPtr;
- Tcl_Namespace *nsPtr = (Tcl_Namespace *) iPtr->varFramePtr->nsPtr;
+ Tcl_Namespace *nsPtr = TclGetCurrentNamespace(interp);
if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "command ?arg ...?");
@@ -8430,7 +8430,7 @@ TclNRYieldToObjCmd(
return TCL_ERROR;
}
- if (((Namespace *) TclGetCurrentNamespace(interp))->flags & NS_DYING) {
+ if (((Namespace *) nsPtr)->flags & NS_DYING) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"yieldto called in deleted namespace", -1));
Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "YIELDTO_IN_DELETED",