1 files changed, 14 insertions, 0 deletions

diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c
index 85955669ac..e66acd5270 100644
--- a/src/lib/evas/common/evas_thread_render.c
+++ b/src/lib/evas/common/evas_thread_render.c
@@ -220,7 +220,21 @@ evas_thread_shutdown(void)
           }
      }
 
+#if defined(__APPLE__) && defined(__MACH__)
+   /*
+    * FIXME
+    *
+    * MacOS currently undergo a fatal issue on shutdown: pthread_join()
+    * crashes. I still have no clue why... Sue to the imminent release,
+    * let's NOT join this thread: do nothing at all!
+    *
+    * THIS IS A TERRIBLE KLUDGE. IT MUST NOT STAY AFTER THE RELEASE OCCURS!
+    *
+    * FIXME
+    */
+#else
    eina_thread_join(evas_thread_worker);
+#endif
 timeout_shutdown:
    eina_lock_free(&evas_thread_queue_lock);
    eina_condition_free(&evas_thread_queue_condition);