summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-12-16 12:01:30 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-12-16 12:09:52 +0900
commit24d43f2f487048596cd835aee53b439cf4442f44 (patch)
tree26e68a10228dcceccefba2bf19b958497638c443
parentd9e149eb4d55cf4bd03845cfdd412713bdd080a5 (diff)
efl loop - fix merge issue with future changes.
-rw-r--r--src/lib/ecore/efl_loop.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 661bf654a9..09ea62a1ac 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -357,27 +357,26 @@ _efl_loop_arguments_cleanup(Eina_Array *arga)
357 eina_array_free(arga); 357 eina_array_free(arga);
358} 358}
359 359
360static void 360static Eina_Value
361_efl_loop_arguments_send(void *data, const Efl_Event *ev EINA_UNUSED) 361_efl_loop_arguments_send(void *data, const Eina_Value v,
362 const Eina_Future *dead EINA_UNUSED)
363
362{ 364{
363 static Eina_Bool initialization = EINA_TRUE; 365 static Eina_Bool initialization = EINA_TRUE;
364 Efl_Loop_Arguments arge; 366 Efl_Loop_Arguments arge;
365 Eina_Array *arga = data; 367 Eina_Array *arga = data;
366 368
369 if (v.type == EINA_VALUE_TYPE_ERROR) goto on_error;
370
367 arge.argv = arga; 371 arge.argv = arga;
368 arge.initialization = initialization; 372 arge.initialization = initialization;
369 initialization = EINA_FALSE; 373 initialization = EINA_FALSE;
370 374
371 efl_event_callback_call(ecore_main_loop_get(), 375 efl_event_callback_call(ecore_main_loop_get(),
372 EFL_LOOP_EVENT_ARGUMENTS, &arge); 376 EFL_LOOP_EVENT_ARGUMENTS, &arge);
373 377on_error:
374 _efl_loop_arguments_cleanup(arga); 378 _efl_loop_arguments_cleanup(arga);
375} 379 return v;
376
377static void
378_efl_loop_arguments_cancel(void *data, const Efl_Event *ev EINA_UNUSED)
379{
380 _efl_loop_arguments_cleanup(data);
381} 380}
382 381
383// It doesn't make sense to send those argument to any other mainloop 382// It doesn't make sense to send those argument to any other mainloop