fix ecore-file inotify monitoring on soon-to-be deleted files

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@71985 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 01d7ee6..d3706d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -744,3 +744,7 @@
 
         * ibus-immodule: Add immodule for supporting ibus.
 
+2012-06-12  Mike Blumenkrantz
+
+        * Fixed bug in ecore-file monitoring with inotify where watching a file
+          that was deleted broke the world.

diff --git a/src/lib/ecore_file/ecore_file_monitor_inotify.c b/src/lib/ecore_file/ecore_file_monitor_inotify.c
index efdd8c2..30226d3 100644 (file)
--- a/src/lib/ecore_file/ecore_file_monitor_inotify.c
+++ b/src/lib/ecore_file/ecore_file_monitor_inotify.c
@@ -274,7 +274,7 @@ _ecore_file_monitor_inotify_events(Ecore_File_Monitor *em, char *file, int mask)
          * else delete it */
         if (ecore_file_exists(em->path))
           {
-             if (!_ecore_file_monitor_inotify_monitor(em, em->path))
+             if (_ecore_file_monitor_inotify_monitor(em, em->path))
                em->func(em->data, em, ECORE_FILE_EVENT_DELETED_SELF, em->path);
           }
         else
@@ -301,7 +301,7 @@ _ecore_file_monitor_inotify_monitor(Ecore_File_Monitor *em, const char *path)
       inotify_add_watch(ecore_main_fd_handler_fd_get(_fdh), path, mask);
    if (ECORE_FILE_MONITOR_INOTIFY(em)->wd < 0)
      {
-        ERR("inotify_add_watch error");
+        INF("inotify_add_watch failed, file was deleted");
         ecore_file_monitor_inotify_del(em);
         return 0;
      }