diff options
| -rw-r--r-- | file.c | 9 | ||||
| -rw-r--r-- | gtk/file_dlg.c | 18 |
2 files changed, 16 insertions, 11 deletions
@@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c,v 1.193 2000/07/03 08:35:39 guy Exp $ + * $Id: file.c,v 1.194 2000/07/03 09:34:05 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1710,9 +1710,10 @@ done: break; case READ_ABORTED: - /* Exit by leaving the main loop, so that any quit functions - we registered get called. */ - gtk_main_quit(); + /* The user bailed out of re-reading the capture file; the + capture file has been closed - just return (without + changing any menu settings; "close_cap_file()" set them + correctly for the "no capture file open" state). */ return 0; } set_menus_for_unsaved_capture_file(FALSE); diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index 365bd914b0..81c3861195 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -1,7 +1,7 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c,v 1.26 2000/06/27 07:13:25 guy Exp $ + * $Id: file_dlg.c,v 1.27 2000/07/03 09:34:27 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -231,9 +231,11 @@ file_open_ok_cb(GtkWidget *w, GtkFileSelection *fs) { break; case READ_ABORTED: - /* Exit by leaving the main loop, so that any quit functions - we registered get called. */ - gtk_main_quit(); + /* The user bailed out of re-reading the capture file; the + capture file has been closed - just free the capture file name + string and return (without changing the last containing + directory). */ + g_free(cf_name); return; } @@ -531,9 +533,11 @@ file_reload_cmd_cb(GtkWidget *w, gpointer data) { break; case READ_ABORTED: - /* Exit by leaving the main loop, so that any quit functions - we registered get called. */ - gtk_main_quit(); + /* The user bailed out of re-reading the capture file; the + capture file has been closed - just free the capture file name + string and return (without changing the last containing + directory). */ + g_free(filename); return; } } else { |