forked from enlightenment/enlightenment
If the desktop editor dialog is closed, close any open icon selector dialog.
This fixes a nasty segfault if you closed the editor dialog while the icon selector dialog was open. SVN revision: 34771
This commit is contained in:
parent
34eb4aeda4
commit
e763cc453f
|
@ -313,9 +313,9 @@ _e_desktop_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
if (cfdata->desktop) efreet_desktop_free(cfdata->desktop);
|
if (cfdata->desktop) efreet_desktop_free(cfdata->desktop);
|
||||||
if (cfdata->editor->tmp_image_path)
|
if (cfdata->editor->tmp_image_path)
|
||||||
{
|
{
|
||||||
if (!cfdata->desktop || !cfdata->editor->saved ||
|
if ((!cfdata->desktop) || (!cfdata->editor->saved) ||
|
||||||
!cfdata->desktop->icon ||
|
(!cfdata->desktop->icon) ||
|
||||||
strcmp(cfdata->editor->tmp_image_path, cfdata->desktop->icon))
|
(strcmp(cfdata->editor->tmp_image_path, cfdata->desktop->icon)))
|
||||||
{
|
{
|
||||||
ecore_file_unlink(cfdata->editor->tmp_image_path);
|
ecore_file_unlink(cfdata->editor->tmp_image_path);
|
||||||
}
|
}
|
||||||
|
@ -331,6 +331,9 @@ _e_desktop_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
IFFREE(cfdata->icon);
|
IFFREE(cfdata->icon);
|
||||||
IFFREE(cfdata->mimes);
|
IFFREE(cfdata->mimes);
|
||||||
|
|
||||||
|
if (cfdata->editor->icon_fsel_dia)
|
||||||
|
e_object_del(E_OBJECT(cfdata->editor->icon_fsel_dia));
|
||||||
|
|
||||||
e_object_del(E_OBJECT(cfdata->editor));
|
e_object_del(E_OBJECT(cfdata->editor));
|
||||||
free(cfdata);
|
free(cfdata);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue