mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
07f61642e4
commit
e3d946f250
2 changed files with 9 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
|||
Mon Apr 11 20:11:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||
|
||||
* ext/tk/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV when exit
|
||||
on Tcl/Tk8.3.x.
|
||||
|
||||
Mon Apr 11 15:24:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue