From 24d43f2f487048596cd835aee53b439cf4442f44 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Sat, 16 Dec 2017 12:01:30 +0900
Subject: [PATCH] efl loop - fix merge issue with future changes.

---
 src/lib/ecore/efl_loop.c | 17 ++++++++---------
 1 file 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)
    eina_array_free(arga);
 }
 
-static void
-_efl_loop_arguments_send(void *data, const Efl_Event *ev EINA_UNUSED)
+static Eina_Value
+_efl_loop_arguments_send(void *data, const Eina_Value v,
+                         const Eina_Future *dead EINA_UNUSED)
+
 {
    static Eina_Bool initialization = EINA_TRUE;
    Efl_Loop_Arguments arge;
    Eina_Array *arga = data;
 
+   if (v.type == EINA_VALUE_TYPE_ERROR) goto on_error;
+
    arge.argv = arga;
    arge.initialization = initialization;
    initialization = EINA_FALSE;
 
    efl_event_callback_call(ecore_main_loop_get(),
                            EFL_LOOP_EVENT_ARGUMENTS, &arge);
-
+on_error:
    _efl_loop_arguments_cleanup(arga);
-}
-
-static void
-_efl_loop_arguments_cancel(void *data, const Efl_Event *ev EINA_UNUSED)
-{
-   _efl_loop_arguments_cleanup(data);
+   return v;
 }
 
 // It doesn't make sense to send those argument to any other mainloop