1 files changed, 3 insertions, 0 deletions
diff --git a/eval.c b/eval.c
index 6d88111a85..e764e5c23e 100644
--- a/eval.c
+++ b/eval.c
@@ -10318,13 +10318,16 @@ rb_thread_wait_for(time)
 	curr_thread == curr_thread->next ||
 	curr_thread->status == THREAD_TO_KILL) {
 	int n;
+	int thr_critical = rb_thread_critical;
 #ifndef linux
 	double d, limit;
 	limit = timeofday()+(double)time.tv_sec+(double)time.tv_usec*1e-6;
 #endif
 	for (;;) {
+	    rb_thread_critical = Qtrue;
 	    TRAP_BEG;
 	    n = select(0, 0, 0, 0, &time);
+	    rb_thread_critical = thr_critical;
 	    TRAP_END;
 	    if (n == 0) return;
 	    if (n < 0) {