* bug fix

* change mainloop_abort_on_no_widget_cmd => mainloop_abort_on_exception
  ( to avoid thread timing trouble on accessing destroyed widgets )


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 1 deletions

diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index b08923e1d0..e054f3dd91 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -25,6 +25,12 @@ MultiTkIp_OK.freeze
 ################################################
 # methods for construction
 class MultiTkIp
+
+  # ignore exception on the mainloop
+  TclTkLib.mainloop_abort_on_exception = false
+
+  ######################################
+
   SLAVE_IP_ID = ['slave'.freeze, '00000']
 
   @@IP_TABLE = {}
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index c6c0e799d7..6ee5c36fba 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -3359,7 +3359,7 @@ class TkObject<TkKernel
   private :tk_trace_variable
 
   def destroy
-    tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if @var_id
+    tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if defined? @var_id
   end
 end