diff options
author | Stefan Schmidt <stefan@osg.samsung.com> | 2017-08-07 11:53:00 +0200 |
---|---|---|
committer | Stefan Schmidt <stefan@osg.samsung.com> | 2017-08-07 11:53:00 +0200 |
commit | dbf7057bca7f36c8ffa2cb2e60d9c148433b3301 (patch) | |
tree | 747ab968c0853da5922cfeffad041aead28df0d4 /src/lib/evas/common | |
parent | 40945d985967e58d6e6c00ecfd6292a8d67b83b5 (diff) |
Revert "efl: terrible kludge so avoid termination crash on osx"
This reverts commit 9368eedd353a88dd31ba50c71433f81a2978adb5.
The release is out so we can revert this bandaid again. In the hope to
find the real culprit and solution before the next release.
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r-- | src/lib/evas/common/evas_thread_render.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c index 2f3b291927..bbde81a657 100644 --- a/src/lib/evas/common/evas_thread_render.c +++ b/src/lib/evas/common/evas_thread_render.c | |||
@@ -261,21 +261,7 @@ evas_thread_shutdown(void) | |||
261 | } | 261 | } |
262 | } | 262 | } |
263 | 263 | ||
264 | #if defined(__APPLE__) && defined(__MACH__) | ||
265 | /* | ||
266 | * FIXME | ||
267 | * | ||
268 | * MacOS currently undergo a fatal issue on shutdown: pthread_join() | ||
269 | * crashes. I still have no clue why... Sue to the imminent release, | ||
270 | * let's NOT join this thread: do nothing at all! | ||
271 | * | ||
272 | * THIS IS A TERRIBLE KLUDGE. IT MUST NOT STAY AFTER THE RELEASE OCCURS! | ||
273 | * | ||
274 | * FIXME | ||
275 | */ | ||
276 | #else | ||
277 | eina_thread_join(evas_thread_worker); | 264 | eina_thread_join(evas_thread_worker); |
278 | #endif | ||
279 | timeout_shutdown: | 265 | timeout_shutdown: |
280 | eina_lock_free(&evas_thread_queue_lock); | 266 | eina_lock_free(&evas_thread_queue_lock); |
281 | eina_condition_free(&evas_thread_queue_condition); | 267 | eina_condition_free(&evas_thread_queue_condition); |