aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2013-12-10 12:19:20 -0500
committerMike Blumenkrantz <zmike@samsung.com>2013-12-10 12:19:20 -0500
commitd985b01aa96c693214df2d52b76d3dcef2d9816b (patch)
treeb45b72d7b6e00e749010a1a059b731f44011c316
parentset systray icon layer based on gadcon container layer (diff)
downloadenlightenment-d985b01aa96c693214df2d52b76d3dcef2d9816b.tar.gz
check efm queued icons when trying to live delete a file to ensure the icon is deleted
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_fm.c11
3 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dc475c8b0..5bf1e88ae 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 5d9dc6749..75c5a1533 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 5aa42497f..27d9acfc5 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