summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/modules/fileman/e_fwin.c9
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8343a4839..38e163322 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-10-03 Mike Blumenkrantz
2
3 * Fix filemanager spring window closing when dragging from desktop
4
12013-09-19 Mike Blumenkrantz 52013-09-19 Mike Blumenkrantz
2 6
3 * Fix bug where new files could not be created repeatedly 7 * Fix bug where new files could not be created repeatedly
diff --git a/NEWS b/NEWS
index a2606a1a8..9638eccea 100644
--- a/NEWS
+++ b/NEWS
@@ -231,3 +231,4 @@ Fixes:
231 * fixed bug where double clicking filemanager windows would not correctly autosize 231 * fixed bug where double clicking filemanager windows would not correctly autosize
232 * fixed bug where setting min size on a gadget would not be passed to desktop gadgets 232 * fixed bug where setting min size on a gadget would not be passed to desktop gadgets
233 * fixed bug where new files could not be created repeatedly 233 * fixed bug where new files could not be created repeatedly
234 * fixed filemanager spring window closing when dragging from desktop
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 3bc0e37ad..64e088755 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -321,7 +321,14 @@ _e_fwin_dnd_end_cb(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event_info _
321 321
322 /* NOTE: closing the drop target window here WILL break things */ 322 /* NOTE: closing the drop target window here WILL break things */
323 fwin = drag_fwin->spring_parent; 323 fwin = drag_fwin->spring_parent;
324 if (!fwin) return; 324 if (!fwin)
325 {
326 if (!drag_fwin->zone) return;
327 //dragging from desktop, we'll never have a parent here
328 if (drag_fwin->spring_child)
329 _e_fwin_free(drag_fwin->spring_child);
330 return;
331 }
325 332
326 fwin->spring_child->spring_parent = NULL; 333 fwin->spring_child->spring_parent = NULL;
327 fwin->spring_child = NULL; 334 fwin->spring_child = NULL;