diff options
| author | Marcel Hollerbach <marcel-hollerbach@t-online.de> | 2017-09-04 19:44:03 +0200 |
|---|---|---|
| committer | Marcel Hollerbach <marcel-hollerbach@t-online.de> | 2017-09-05 14:15:40 +0200 |
| commit | e41d46c635bdf769d4b93da609883347168c719a (patch) | |
| tree | ecd10d772254d0e18b3c7c9a1a4e9e68bc9d736f /src | |
| parent | 61381f6e3584118a70565eea79c355dd049b9e28 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/evas/common/evas_thread_render.c | 4 |
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 bbde81a657..62f0ba1577 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 | 263 | if (!evas_thread_exited) | |
| 264 | eina_thread_join(evas_thread_worker); | 264 | eina_thread_join(evas_thread_worker); |
| 265 | timeout_shutdown: | 265 | timeout_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); |