From f295f29160bd6d43e91c95406f30e46cf280ee26 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 2 Nov 2009 04:32:28 +0000
Subject: * thread_pthread.c (native_stop_timer_thread): need to join timer
 thread   only when really stopping it.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 thread_pthread.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'thread_pthread.c')

diff --git a/thread_pthread.c b/thread_pthread.c
index e3ff6ee71..e82777d68 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -814,9 +814,9 @@ native_stop_timer_thread(void)
     stopped = --system_working <= 0;
     if (stopped) {
 	native_cond_signal(&timer_thread_cond);
+	native_thread_join(timer_thread_id);
     }
     native_mutex_unlock(&timer_thread_lock);
-    native_thread_join(timer_thread_id);
     return stopped;
 }
 
-- 
cgit