From e41d46c635bdf769d4b93da609883347168c719a Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 4 Sep 2017 19:44:03 +0200 Subject: [PATCH] evas_thread: only join the thread if the thread is still alive otherwise we might join a invalid thread id, that could lead to a deadlock. Lets not do that. ref T5245 @fix --- src/lib/evas/common/evas_thread_render.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c index bbde81a..62f0ba1 100644 --- a/src/lib/evas/common/evas_thread_render.c +++ b/src/lib/evas/common/evas_thread_render.c @@ -260,8 +260,8 @@ evas_thread_shutdown(void) goto timeout_shutdown; } } - - eina_thread_join(evas_thread_worker); + if (!evas_thread_exited) + eina_thread_join(evas_thread_worker); timeout_shutdown: eina_lock_free(&evas_thread_queue_lock); eina_condition_free(&evas_thread_queue_condition); -- 2.7.4