bugfix: fileman spring window closing on desktop when dnd ends

This commit is contained in:
Mike Blumenkrantz 2013-10-03 09:45:26 +01:00
parent d739c009d3
commit fbe015de2e
3 changed files with 13 additions and 1 deletions

View File

@ -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

1
NEWS
View File

@ -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

View File

@ -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;