diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-06-30 05:49:30 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-06-30 05:49:30 +0000 |
| commit | f2377189b007b6348c9cda05b9ea8420d16b52a4 (patch) | |
| tree | 290e5a2fddf58774896ca902be39e8691e6d34d0 /gtk | |
| parent | 03806370a11168f4db32982e315af701cc00c999 (diff) | |
close temporary merge output file, if merging failed
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11275 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/file_dlg.c | 8 | ||||
| -rw-r--r-- | gtk/main.c | 3 |
2 files changed, 9 insertions, 2 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; diff --git a/gtk/main.c b/gtk/main.c index 592903b8c6..a5fec77356 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.449 2004/06/29 20:59:24 ulfl Exp $ + * $Id: main.c,v 1.450 2004/06/30 05:49:30 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1310,6 +1310,7 @@ dnd_merge_files(int in_file_count, char **in_filenames) simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "An error occurred while merging the files: \"%s\".", wtap_strerror(err)); + close(out_fd); return; } |