summaryrefslogtreecommitdiffstats
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)
commit834d5da992785d4c4046914c8f7c4acb815075cb (patch)
tree04b0ea5cbeac269f069831b264bb0d982ad5a2ec
parent2be298f89da4601749fa18d4375bfaae181e2a66 (diff)
parentc9ae8d64d39dac7abeb842bc20b20d955e7d7b63 (diff)
downloadtcl-834d5da992785d4c4046914c8f7c4acb815075cb.zip
tcl-834d5da992785d4c4046914c8f7c4acb815075cb.tar.gz
tcl-834d5da992785d4c4046914c8f7c4acb815075cb.tar.bz2
improved tidy-up from branch
-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",