kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

delete timer on 0 return AND if manually deleted prefer the delete over the 

continue return of 1


SVN revision: 18954
This commit is contained in:
Carsten Haitzler 2005-12-11 14:33:21 +00:00
parent 7475ec3508
commit e430a7e6fc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legacy/ecore/src/lib/ecore/ecore_timer.c
View File

@ -181,10 +181,15 @@ _ecore_timer_call(double when)
* assume that the system hung and set the timer to go off
* timer->in from now.
*/
if ((timer->at + timer->in) < (when - 30.0))
_ecore_timer_set(timer, when + timer->in, timer->in, timer->func, timer->data);
if (!timer->delete_me)
{
if ((timer->at + timer->in) < (when - 30.0))
_ecore_timer_set(timer, when + timer->in, timer->in, timer->func, timer->data);
else
_ecore_timer_set(timer, timer->at + timer->in, timer->in, timer->func, timer->data);
}
else
_ecore_timer_set(timer, timer->at + timer->in, timer->in, timer->func, timer->data);
free(timer);
}
else
free(timer);