From 3f2adde97f18c43c5b1ddb7f745f7697f869cff6 Mon Sep 17 00:00:00 2001 From: raster Date: Fri, 1 Jul 2011 00:04:06 +0000 Subject: [PATCH] Fix epoll delete fd handling in child process - #796 git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@60895 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 4 ++++ src/lib/ecore/ecore_main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 30e5691..483c9d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -252,3 +252,7 @@ avoid wakeups and excess animation etc. when in the background or another "powersave" state. +2011-07-01 Carsten Haitzler (The Rasterman) + + * Fix epoll delete fd handling in child process - #796 + diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index 027a92c..42de761 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -903,8 +903,8 @@ ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler) return NULL; } - fd_handler->delete_me = EINA_TRUE; _ecore_main_fdh_poll_del(fd_handler); + fd_handler->delete_me = EINA_TRUE; fd_handlers_to_delete = eina_list_append(fd_handlers_to_delete, fd_handler); if (fd_handler->prep_func && fd_handlers_with_prep) fd_handlers_with_prep = eina_list_remove(fd_handlers_with_prep, fd_handler); -- 2.7.4