From 86fe6609c28528734c2ac5da33f58525983f59c0 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 28 Feb 2017 11:46:56 +0100 Subject: [PATCH] eina: move the _eina_main_loop set before we init anything otherwise we could get into problems. fix T4891 @fix --- src/lib/eina/eina_main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c index c0e2825..9a7237f 100644 --- a/src/lib/eina/eina_main.c +++ b/src/lib/eina/eina_main.c @@ -258,6 +258,11 @@ eina_init(void) mtrace(); } #endif + +#ifdef EFL_HAVE_THREADS + _eina_main_loop = pthread_self(); +#endif + eina_freeq_main_set(eina_freeq_new(EINA_FREEQ_DEFAULT)); if (!eina_log_init()) @@ -274,10 +279,6 @@ eina_init(void) return 0; } -#ifdef EFL_HAVE_THREADS - _eina_main_loop = pthread_self(); -#endif - #ifdef EINA_HAVE_DEBUG_THREADS pthread_mutex_init(&_eina_tracking_lock, NULL); -- 2.7.4