[EGIT] [core/enlightenment] master 01/01: check efm queued icons when trying to live delete a file to ensure the icon is deleted

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=d985b01aa96c693214df2d52b76d3dcef2d9816b

commit d985b01aa96c693214df2d52b76d3dcef2d9816b
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Tue Dec 10 12:19:20 2013 -0500

    check efm queued icons when trying to live delete a file to ensure the icon 
is deleted
    
    T633
---
 ChangeLog      |  4 ++++
 NEWS           |  1 +
 src/bin/e_fm.c | 11 +++++++++++
 3 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index dc475c8..5bf1e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-10 Mike Blumenkrantz
+
+        * fixed filemanager race condition causing create-queued icons to not 
be deleted
+
 2013-12-09 Mike Blumenkrantz
 
         * removed physics module
diff --git a/NEWS b/NEWS
index 5d9dc67..75c5a15 100644
--- a/NEWS
+++ b/NEWS
@@ -268,3 +268,4 @@ Fixes:
     * Fix crash when activating e's restart from start gadget triggered menu
     * Further improve initial window placement coordinates
     * Fixed cases where gadgets would sometimes reorder randomly on shelves
+    * fixed filemanager race condition causing create-queued icons to not be 
deleted
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 5aa4249..27d9acf 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -3456,6 +3456,17 @@ _e_fm2_file_del(Evas_Object *obj, const char *file)
              return;
           }
      }
+   EINA_LIST_FOREACH(sd->queue, l, ic)
+     {
+        if (!strcmp(ic->info.file, file))
+          {
+             INF("MATCH!");
+             sd->queue = eina_list_remove_list(sd->queue, l);
+             ic->queued = EINA_FALSE;
+             _e_fm2_icon_free(ic);
+             return;
+          }
+     }
 }
 
 static void

--