Fix segfault if Wallpaper dialog is closed while Import dialog is up

(for Toma) :)



SVN revision: 50325
This commit is contained in:
Christopher Michael 2010-07-18 17:02:12 +00:00
parent 4207eeea80
commit e4d86e02d1
2 changed files with 3 additions and 3 deletions

View File

@ -418,7 +418,7 @@ static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if (cfdata->win_import)
e_int_config_wallpaper_import_del(cfdata->win_import);
e_int_config_wallpaper_fsel_del(cfdata->win_import);
#ifdef HAVE_EXCHANGE
if (cfdata->dia_web)
e_int_config_wallpaper_web_del(cfdata->dia_web);

View File

@ -381,14 +381,14 @@ e_int_config_wallpaper_import_del(E_Win *win)
{
Import *import;
import = win->data;
if (!(import = win->data)) return;
if (import->exe_handler) ecore_event_handler_del(import->exe_handler);
import->exe_handler = NULL;
if (import->tmpf) unlink(import->tmpf);
E_FREE(import->tmpf);
E_FREE(import->fdest);
import->exe = NULL;
e_object_del(E_OBJECT(import->win));
if (import->win) e_object_del(E_OBJECT(import->win));
E_FREE(import->cfdata->file);
E_FREE(import->cfdata);
if (import) free(import);