summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-13 07:22:04 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-13 07:22:04 +0000
commit9ba317f1575bba7d21b4644fa0bee85e2a57c4f4 (patch)
tree8433a3b16371bb2e5d5d657e62ff96505fc655f3 /thread.c
parent9a9cc65035b7b6c06e4990fe2563580ceeb92a1b (diff)
* thread.c (thread_start_func_2): see first_func, not first_proc,
to decide which to use. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/thread.c b/thread.c
index 5bca3e32af..ba717bd2a8 100644
--- a/thread.c
+++ b/thread.c
@@ -420,7 +420,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
TH_PUSH_TAG(th);
if ((state = EXEC_TAG()) == 0) {
SAVE_ROOT_JMPBUF(th, {
- if (th->first_proc) {
+ if (!th->first_func) {
GetProcPtr(th->first_proc, proc);
th->errinfo = Qnil;
th->local_lfp = proc->block.lfp;
@@ -429,7 +429,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
(int)RARRAY_LEN(args), RARRAY_PTR(args), 0);
}
else {
- th->value = (*th->first_func)((void *)th->first_args);
+ th->value = (*th->first_func)((void *)args);
}
});
}