cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=07e5064e15af445ba6529c8513572a70d720a014
commit 07e5064e15af445ba6529c8513572a70d720a014 Author: Cedric BAIL <[email protected]> Date: Mon Mar 12 09:43:44 2018 -0700 eina: fix promise scheduler lookup to find it when given a resolved chain of future. T6738 --- src/lib/eina/eina_promise.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c index 93e091bd9e..5dac1c8443 100644 --- a/src/lib/eina/eina_promise.c +++ b/src/lib/eina/eina_promise.c @@ -663,9 +663,15 @@ _dummy_cancel(void *data EINA_UNUSED, const Eina_Promise *dead_ptr EINA_UNUSED) static Eina_Future_Scheduler * _scheduler_get(Eina_Future *f) { - for (; f->prev != NULL; f = f->prev); - assert(f->promise != NULL); - return f->promise->scheduler; + do + { + if (f->promise) return f->promise->scheduler; + else if (f->scheduled_entry) return f->scheduled_entry->scheduler; + f = f->prev; + } + while (f); + assert(EINA_FALSE && "no scheduler for future!"); + return NULL; } EAPI Eina_Value --
