timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efl loop - fix merge issue with future changes.

This commit is contained in:
Carsten Haitzler 2017-12-16 12:01:30 +09:00
parent d9e149eb4d
commit 24d43f2f48
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/ecore/efl_loop.c
View File

@ -357,27 +357,26 @@ _efl_loop_arguments_cleanup(Eina_Array *arga)
eina_array_free(arga); eina_array_free(arga);
} }
static void static Eina_Value
_efl_loop_arguments_send(void *data, const Efl_Event *ev EINA_UNUSED) _efl_loop_arguments_send(void *data, const Eina_Value v,
const Eina_Future *dead EINA_UNUSED)
{ {
static Eina_Bool initialization = EINA_TRUE; static Eina_Bool initialization = EINA_TRUE;
Efl_Loop_Arguments arge; Efl_Loop_Arguments arge;
Eina_Array *arga = data; Eina_Array *arga = data;
if (v.type == EINA_VALUE_TYPE_ERROR) goto on_error;
arge.argv = arga; arge.argv = arga;
arge.initialization = initialization; arge.initialization = initialization;
initialization = EINA_FALSE; initialization = EINA_FALSE;
efl_event_callback_call(ecore_main_loop_get(), efl_event_callback_call(ecore_main_loop_get(),
EFL_LOOP_EVENT_ARGUMENTS, &arge); EFL_LOOP_EVENT_ARGUMENTS, &arge);
on_error:
_efl_loop_arguments_cleanup(arga); _efl_loop_arguments_cleanup(arga);
} return v;
static void
_efl_loop_arguments_cancel(void *data, const Efl_Event *ev EINA_UNUSED)
{
_efl_loop_arguments_cleanup(data);
} }
// It doesn't make sense to send those argument to any other mainloop // It doesn't make sense to send those argument to any other mainloop