diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-06-30 05:49:30 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-06-30 05:49:30 +0000 |
| commit | 24527148ab2dc1e052ebe3679d5277cc68bfeb47 (patch) | |
| tree | 290e5a2fddf58774896ca902be39e8691e6d34d0 /gtk/file_dlg.c | |
| parent | 14ef5684fa17a81748c0971afc415f115b90adcb (diff) | |
close temporary merge output file, if merging failed
svn path=/trunk/; revision=11275
Diffstat (limited to 'gtk/file_dlg.c')
| -rw-r--r-- | gtk/file_dlg.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index afb59cb687..cf9091d9f1 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.125 2004/06/29 20:59:23 ulfl Exp $ + * $Id: file_dlg.c,v 1.126 2004/06/30 05:49:29 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -59,6 +59,11 @@ #include "merge.h" #include "util.h" +#ifdef HAVE_IO_H +#include <io.h> /* open/close on win32 */ +#endif + + static void file_open_ok_cb(GtkWidget *w, gpointer fs); static void file_open_destroy_cb(GtkWidget *win, gpointer user_data); @@ -989,6 +994,7 @@ file_merge_ok_cb(GtkWidget *w, gpointer fs) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "An error occurred while merging the files: %s.", wtap_strerror(err)); + close(out_fd); if (rfcode != NULL) dfilter_free(rfcode); return; |