diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/modules/fileman/e_fwin.c | 9 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2013-10-03 Mike Blumenkrantz + + * Fix filemanager spring window closing when dragging from desktop + 2013-09-19 Mike Blumenkrantz * Fix bug where new files could not be created repeatedly @@ -231,3 +231,4 @@ Fixes: * fixed bug where double clicking filemanager windows would not correctly autosize * fixed bug where setting min size on a gadget would not be passed to desktop gadgets * fixed bug where new files could not be created repeatedly + * 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 3bc0e37ade..64e0887556 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 _ /* NOTE: closing the drop target window here WILL break things */ fwin = drag_fwin->spring_parent; - if (!fwin) return; + if (!fwin) + { + if (!drag_fwin->zone) return; + //dragging from desktop, we'll never have a parent here + if (drag_fwin->spring_child) + _e_fwin_free(drag_fwin->spring_child); + return; + } fwin->spring_child->spring_parent = NULL; fwin->spring_child = NULL; |