summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2013-07-08 07:50:35 +0100
committerChris Michael <cp.michael@samsung.com>2013-07-08 07:50:35 +0100
commitb0fa8b65639c5a8f72b29f8b86814224537ef936 (patch)
tree5951b44d7d2461b4be905283a8773502a177f1ef /src
parent10897713ea50bf4b990de7a73ca9fe2e6846bdd7 (diff)
Remove timer and animator from the list Before freeing the variables.
NB: Fixes Coverity CID1039906 and CID1039906 Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/edje/edje_var.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/edje/edje_var.c b/src/lib/edje/edje_var.c
index d4448b6014..5e40f627c7 100644
--- a/src/lib/edje/edje_var.c
+++ b/src/lib/edje/edje_var.c
@@ -242,9 +242,9 @@ _edje_var_shutdown(Edje *ed)
242 Edje_Var_Timer *et; 242 Edje_Var_Timer *et;
243 243
244 et = eina_list_data_get(ed->var_pool->timers); 244 et = eina_list_data_get(ed->var_pool->timers);
245 ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et);
245 ecore_timer_del(et->timer); 246 ecore_timer_del(et->timer);
246 free(et); 247 free(et);
247 ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et);
248 } 248 }
249 if (ed->var_pool->animators) 249 if (ed->var_pool->animators)
250 { 250 {
@@ -263,8 +263,8 @@ _edje_var_shutdown(Edje *ed)
263 Edje_Var_Animator *ea; 263 Edje_Var_Animator *ea;
264 264
265 ea = eina_list_data_get(ed->var_pool->animators); 265 ea = eina_list_data_get(ed->var_pool->animators);
266 free(ea);
267 ed->var_pool->animators = eina_list_remove(ed->var_pool->animators, ea); 266 ed->var_pool->animators = eina_list_remove(ed->var_pool->animators, ea);
267 free(ea);
268 } 268 }
269 free(ed->var_pool); 269 free(ed->var_pool);
270 ed->var_pool = NULL; 270 ed->var_pool = NULL;