diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-11 11:14:33 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-11 11:14:33 +0000 |
commit | e3d946f2503d01f6758911d458a9b9ef50e8080c (patch) | |
tree | b639b1a0fcb17fdcd8bb7623c364eca2b041b07b /ext/tk | |
parent | 07f61642e49d48ca2551f533573832dbcfc7b486 (diff) | |
download | ruby-e3d946f2503d01f6758911d458a9b9ef50e8080c.tar.gz |
* ext/tk/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV when exit
on Tcl/Tk8.3.x.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
-rw-r--r-- | ext/tk/tcltklib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 1a00c7e757..21c9d904cc 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -4365,7 +4365,7 @@ delete_slaves(ip) ip_finalize(slave); Tcl_DeleteInterp(slave); - Tcl_Release(slave); + /* Tcl_Release(slave); */ } } @@ -4407,7 +4407,7 @@ ip_finalize(ip) delete_slaves(ip); /* delete root widget */ - Tcl_GlobalEval(ip, "destroy ."); + Tcl_GlobalEval(ip, "catch {destroy .}"); /* call finalize-hook-proc */ if (Tcl_GetCommandInfo(ip, finalize_hook_name, &info)) { @@ -4415,8 +4415,8 @@ ip_finalize(ip) Tcl_GlobalEval(ip, finalize_hook_name); } - DUMP1("call cancel aftern scripts"); - Tcl_GlobalEval(ip, "foreach id [after info] {after cancel $id}"); + DUMP1("cancel after scripts"); + Tcl_GlobalEval(ip, "catch {foreach id [after info] {after cancel $id}}"); Tcl_Release(ip); |