aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-02-04 13:18:55 +0530
committerAmitesh Singh <amitesh.sh@samsung.com>2017-02-04 13:30:49 +0530
commit1a798c37dc9258a1e322a740ee07ef1da285e2d2 (patch)
treec3a07afd23eac70d8da36bcd94e0f48ea2d7cbef
parentevas render - drop eo overhead by using ptrs we already have (diff)
downloadefl-1a798c37dc9258a1e322a740ee07ef1da285e2d2.tar.gz
edje: unset timer pointer after delete.
Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>
-rw-r--r--src/lib/edje/edje_callbacks.c1
-rw-r--r--src/lib/edje/edje_load.c1
-rw-r--r--src/lib/edje/edje_program.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 8a320933c9..88154891fa 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -437,6 +437,7 @@ _edje_pending_timer_cb(void *data)
pp = data;
pp->edje->pending_actions = eina_list_remove(pp->edje->pending_actions, pp);
_edje_program_run(pp->edje, pp->program, 1, "", "");
+ pp->timer = NULL;
free(pp);
return ECORE_CALLBACK_CANCEL;
}
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 01030e30db..c87958685b 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -2051,6 +2051,7 @@ _edje_file_del(Edje *ed)
EINA_LIST_FREE(ed->pending_actions, pp)
{
ecore_timer_del(pp->timer);
+ pp->timer = NULL;
free(pp);
}
}
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 232dcb3ccf..1482fa4c9c 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -873,6 +873,7 @@ low_mem_current:
{
ed->pending_actions = eina_list_remove(ed->pending_actions, pp);
ecore_timer_del(pp->timer);
+ pp->timer = NULL;
free(pp);
// goto done;
}