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

ecore - fd handlers - only delete legacy eo objects in handlers 

if its a non-legacy loop handler that also binds an fd handler
internally (the 2 things are linked as a pair) then on loop del, dont
del the objet as the obj del should handle things elsehwere.
This commit is contained in:
Carsten Haitzler 2018-02-21 15:45:55 +09:00
parent 47ff2d8126
commit 8c62e2a817
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/ecore/ecore_main.c
View File

@ -136,6 +136,7 @@ struct _Ecore_Fd_Handler
Eina_Bool error_active : 1;
Eina_Bool delete_me : 1;
Eina_Bool file : 1;
Eina_Bool legacy : 1;
};
GENERIC_ALLOC_SIZE_DECLARE(Ecore_Fd_Handler);
@ -1374,6 +1375,7 @@ ecore_main_fd_handler_add(int fd,
fdh = _ecore_main_fd_handler_add(efl_loop_main_get(EFL_LOOP_CLASS),
ML_DAT, NULL, fd, flags, func, data,
buf_func, buf_data, EINA_FALSE);
fdh->legacy = EINA_TRUE;
return fdh;
}
@ -1615,7 +1617,7 @@ _ecore_main_content_clear(Efl_Loop_Data *pd)
pd->fd_handlers = (Ecore_Fd_Handler *)
eina_inlist_remove(EINA_INLIST_GET(pd->fd_handlers),
EINA_INLIST_GET(fdh));
if (fdh->handler) efl_del(fdh->handler);
if ((fdh->handler) && (fdh->legacy)) efl_del(fdh->handler);
else
{
// XXX: can't do this because this fd handler is legacy and might