summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-09-05 14:36:17 +0200
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-09-05 14:36:17 +0200
commite1738c4f1eec731715cb60906ee6caa443f9165f (patch)
tree262be69d768e8c6b62d81e2374c6aef665d26a35 /src
parente41d46c635bdf769d4b93da609883347168c719a (diff)
Revert "evas_thread: only join the thread if the thread is still alive"
This reverts commit e41d46c635bdf769d4b93da609883347168c719a. This seems to be wrong
Diffstat (limited to '')
-rw-r--r--src/lib/evas/common/evas_thread_render.c4
1 files 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 62f0ba1577..bbde81a657 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)
260 goto timeout_shutdown; 260 goto timeout_shutdown;
261 } 261 }
262 } 262 }
263 if (!evas_thread_exited) 263
264 eina_thread_join(evas_thread_worker); 264 eina_thread_join(evas_thread_worker);
265timeout_shutdown: 265timeout_shutdown:
266 eina_lock_free(&evas_thread_queue_lock); 266 eina_lock_free(&evas_thread_queue_lock);
267 eina_condition_free(&evas_thread_queue_condition); 267 eina_condition_free(&evas_thread_queue_condition);