raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f3b6d34a0fc0af17643098615a5cfde1b1890ad6
commit f3b6d34a0fc0af17643098615a5cfde1b1890ad6
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Fri Jun 3 17:57:58 2016 +0900
ecore timeouts - dont crash on cancel
this fixes a nasty double deletion on cancel of timeouts. at least for
now as long as we have promises.
---
src/lib/ecore/ecore_main.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index e17a5dd..a361289 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2874,10 +2874,11 @@ _efl_loop_job_cancel(void* data, Eina_Promise_Owner*
promise EINA_UNUSED)
Efl_Internal_Promise *j = data;
if (j->job_is)
- ecore_job_del(j->u.job);
- else
- eo_del(j->u.timer);
- _efl_loop_internal_cancel(j);
+ {
+ ecore_job_del(j->u.job);
+ _efl_loop_internal_cancel(j);
+ }
+ else eo_del(j->u.timer);
}
static Efl_Internal_Promise *
--
