From 4f2af2475551bcddb8b48a6c832563277635af92 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 7 Feb 2017 16:32:22 -0800 Subject: [PATCH] ecore: reset during timer callback execution doesn't make sense. @fix T3222 --- src/lib/ecore/ecore_timer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 5af5ff7..128158d 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -300,6 +300,9 @@ _efl_loop_timer_reset(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer) double now, add; EINA_MAIN_LOOP_CHECK_RETURN; + // Do not reset the current timer while inside the callback + if (timer_current == timer) return ; + now = ecore_time_get(); if (!timer->initialized) @@ -321,6 +324,9 @@ _efl_loop_timer_loop_reset(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer) double now, add; EINA_MAIN_LOOP_CHECK_RETURN; + // Do not reset the current timer while inside the callback + if (timer_current == timer) return ; + now = ecore_loop_time_get(); if (!timer->initialized) -- 2.7.4