summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2015-12-11 21:21:53 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2015-12-11 21:21:53 (GMT)
commita43d771d3da4ef672250513b5c87831cfd17565b (patch)
tree8c5707f5512ce4be282d4f488b075fb979992481 /generic
parented480528f627d0b75d3fd57ca9242123896d1c1b (diff)
downloadtcl-a43d771d3da4ef672250513b5c87831cfd17565b.zip
tcl-a43d771d3da4ef672250513b5c87831cfd17565b.tar.gz
tcl-a43d771d3da4ef672250513b5c87831cfd17565b.tar.bz2
fix segfault on invokhidden - faulty adaptation at last merge
Diffstat (limited to 'generic')
-rw-r--r--generic/tclInterp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 839990c..bb0f78f 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -3079,7 +3079,9 @@ SlaveInvokeHidden(
Tcl_AllowExceptions(slaveInterp);
if (namespaceName == NULL) {
- TclNRSetRoot(slaveInterp);
+ if (interp != slaveInterp) {
+ TclNRSetRoot(slaveInterp);
+ }
Tcl_NRAddCallback(interp, NRPostInvokeHidden, slaveInterp,
NULL, NULL, NULL);
return TclNRInvoke(NULL, slaveInterp, objc, objv);