summaryrefslogtreecommitdiff
path: root/src/lib/eina
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-02-28 11:46:56 +0100
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-02-28 11:46:56 +0100
commit86fe6609c28528734c2ac5da33f58525983f59c0 (patch)
treee214bd18130ca42a4e09edc89d818435b55b0f97 /src/lib/eina
parent1974f5d511bbfd3679151b01dfdd38892606b0e7 (diff)
eina: move the _eina_main_loop set before we init anything
otherwise we could get into problems. fix T4891 @fix
Diffstat (limited to 'src/lib/eina')
-rw-r--r--src/lib/eina/eina_main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c
index c0e2825151..9a7237fd7f 100644
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@@ -258,6 +258,11 @@ eina_init(void)
258 mtrace(); 258 mtrace();
259 } 259 }
260#endif 260#endif
261
262#ifdef EFL_HAVE_THREADS
263 _eina_main_loop = pthread_self();
264#endif
265
261 eina_freeq_main_set(eina_freeq_new(EINA_FREEQ_DEFAULT)); 266 eina_freeq_main_set(eina_freeq_new(EINA_FREEQ_DEFAULT));
262 267
263 if (!eina_log_init()) 268 if (!eina_log_init())
@@ -274,10 +279,6 @@ eina_init(void)
274 return 0; 279 return 0;
275 } 280 }
276 281
277#ifdef EFL_HAVE_THREADS
278 _eina_main_loop = pthread_self();
279#endif
280
281#ifdef EINA_HAVE_DEBUG_THREADS 282#ifdef EINA_HAVE_DEBUG_THREADS
282 pthread_mutex_init(&_eina_tracking_lock, NULL); 283 pthread_mutex_init(&_eina_tracking_lock, NULL);
283 284