bugfix: don't try to destroy a window, when it's already being destroyed

svn path=/trunk/; revision=11016
This commit is contained in:
Ulf Lamping 2004-05-27 16:48:36 +00:00
parent 7bc663239f
commit e22528662a
2 changed files with 2 additions and 4 deletions

View File

@ -1,7 +1,7 @@
/* column_prefs.c
* Dialog box for column preferences
*
* $Id: column_prefs.c,v 1.23 2004/05/26 03:49:22 ulfl Exp $
* $Id: column_prefs.c,v 1.24 2004/05/27 16:48:36 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -681,5 +681,4 @@ column_prefs_destroy(GtkWidget *w) {
/* Let the list cb know we're about to destroy the widget tree, so it */
/* doesn't operate on widgets that don't exist. */
OBJECT_SET_DATA(w, E_COL_CM_KEY, (gpointer)TRUE);
window_destroy(GTK_WIDGET(w));
}

View File

@ -1,6 +1,6 @@
/* follow_dlg.c
*
* $Id: follow_dlg.c,v 1.61 2004/05/26 21:23:20 guy Exp $
* $Id: follow_dlg.c,v 1.62 2004/05/27 16:45:25 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -468,7 +468,6 @@ follow_destroy_cb(GtkWidget *w, gpointer data _U_)
follow_info = OBJECT_GET_DATA(w, E_FOLLOW_INFO_KEY);
unlink(follow_info->data_out_filename);
g_free(follow_info->filter_out_filter);
window_destroy(w);
forget_follow_info(follow_info);
g_free(follow_info);
}