discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=fbe015de2e8c9be553f0218396e97b9080d9aca9
commit fbe015de2e8c9be553f0218396e97b9080d9aca9 Author: Mike Blumenkrantz <[email protected]> Date: Thu Oct 3 09:45:26 2013 +0100 bugfix: fileman spring window closing on desktop when dnd ends --- ChangeLog | 4 ++++ NEWS | 1 + src/modules/fileman/e_fwin.c | 9 ++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8343a48..38e1633 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/NEWS b/NEWS index a2606a1..9638ecc 100644 --- a/NEWS +++ b/NEWS @@ -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 3bc0e37..64e0887 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; --
