From 382079bccd5c54c3041df25b6555f46cd502c4fc Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Sat, 5 May 2018 21:15:24 -0700 Subject: [PATCH] eio: cancel idler on Eio.Model destruction properly. --- src/lib/eio/eio_model.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c index 1191244b3a..b8e8ebfaf8 100644 --- a/src/lib/eio/eio_model.c +++ b/src/lib/eio/eio_model.c @@ -408,8 +408,9 @@ _eio_build_mime_now(void *data, const Eina_Value v, const Eina_Future *dead_futu // Make sure that we are not over consuming time in the main loop if (delayed_queue || ecore_time_get() - ecore_loop_time_get() > 0.004) { - return eina_future_as_value(eina_future_then(_build_delay(pd->loop), - _eio_build_mime_now, model)); + Eina_Future *f = eina_future_then(_build_delay(pd->loop), + _eio_build_mime_now, model); + return eina_future_as_value(efl_future_Eina_FutureXXX_then(model, f)); } pd->mime_type = efreet_mime_type_get(pd->path);