1 files changed, 5 insertions, 0 deletions

diff --git a/src/lib/eio/eio_monitor_inotify.c b/src/lib/eio/eio_monitor_inotify.c
index faa34b3de4..2222a56476 100644
--- a/src/lib/eio/eio_monitor_inotify.c
+++ b/src/lib/eio/eio_monitor_inotify.c
@@ -141,6 +141,9 @@ _eio_inotify_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fdh)
         if ((event_size + i) > size) break ;
         i += event_size;
 
+        // No need to waste time looking up for just destroyed handler
+        if ((event->mask & IN_IGNORED)) continue ;
+
         backend = eina_hash_find(_inotify_monitors, &event->wd);
         if (!backend) continue ;
         if (!backend->parent) continue ;
@@ -268,6 +271,8 @@ void eio_monitor_backend_del(Eio_Monitor *monitor)
    monitor->backend = NULL;
    if (!backend) return;
 
+   backend->parent = NULL;
+
    eina_hash_del(_inotify_monitors, &backend->hwnd, backend);
 }