about summary refs log tree commit diff
path: root/src/rt/rust_builtin.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-02-14 00:43:45 -0800
committerBrian Anderson <banderson@mozilla.com>2012-02-14 11:24:09 -0800
commitd5e7f0d1134c41757901ccb9e944974042ee3d93 (patch)
tree96a27c2daa6411b57c46f43453088264f573fa47 /src/rt/rust_builtin.cpp
parent3f4872f03284f4737675a68438350dd2958db229 (diff)
downloadrust-d5e7f0d1134c41757901ccb9e944974042ee3d93.tar.gz
rust-d5e7f0d1134c41757901ccb9e944974042ee3d93.zip
rt: Don't kill tasks while they are in a callback from C
Diffstat (limited to 'src/rt/rust_builtin.cpp')
-rw-r--r--src/rt/rust_builtin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 918630b18f6..628389f10ce 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -576,7 +576,7 @@ port_recv(uintptr_t *dptr, rust_port *port,
 
         // If this task has been killed then we're not going to bother
         // blocking, we have to unwind.
-        if (task->killed) {
+        if (task->must_fail_from_being_killed()) {
             *killed = true;
             return;
         }