summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS1
-rw-r--r--src/lib/ecore/ecore_anim.c22
3 files changed, 13 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 02d0bcb2c5..749486e97b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-26 Daniel Juyung Seo (SeoZ)
+
+ * ecore anim: Fixed animator not working problem when source_set is
+ changed back and forth very fast.
+
2013-11-26 Cedric Bail
* Evas: Allow fuzziness on the texture format returned by GL.
diff --git a/NEWS b/NEWS
index bd3adc8cb7..56b44c3069 100644
--- a/NEWS
+++ b/NEWS
@@ -369,6 +369,7 @@ Fixes:
* Ecore:
- Don't leak fd on exec.
- Fix fd handler increase issue when ecore_pipe_add/del is called repeatedly.
+ - Fixed animator not working problem when source_set is changed back and forth very fast.
* Ecore_Con:
- Fix a memory leak in ecore_con_dns when using ecore_con_server_connect.
- Don't leak fd on exec.
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 5e99eaeed7..7b33f71385 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -88,23 +88,15 @@ _end_tick(void)
{
if (!ticking) return;
ticking = 0;
- switch (src)
- {
- case ECORE_ANIMATOR_SOURCE_TIMER:
- if (timer)
- {
- _ecore_timer_del(timer);
- timer = NULL;
- }
- break;
- case ECORE_ANIMATOR_SOURCE_CUSTOM:
- if (end_tick_cb) end_tick_cb((void *)end_tick_data);
- break;
-
- default:
- break;
+ if (timer)
+ {
+ _ecore_timer_del(timer);
+ timer = NULL;
}
+
+ if ((src == ECORE_ANIMATOR_SOURCE_CUSTOM) && end_tick_cb)
+ end_tick_cb((void *)end_tick_data);
}
static Eina_Bool