Fixed Thread#kill.

rubinius · Jun 18, 2016 · 0da995f · 0da995f
1 parent d2930b5
commit 0da995f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/machine/vm.cpp b/machine/vm.cpp
@@ -177,7 +177,12 @@ namespace rubinius {
     }
 
     if(interrupt_by_kill()) {
-      set_check_local_interrupts();
+      if(state->vm()->thread()->current_fiber()->root_p()) {
+        clear_interrupt_by_kill();
+      } else {
+        set_check_local_interrupts();
+      }
+
       thread_state_.raise_thread_kill();
 
       return true;