osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

When merging, default to the current file format as the output format. 

svn path=/trunk/; revision=12327
This commit is contained in:
Guy Harris 2004-10-17 03:11:31 +00:00
parent 4624549a99
commit 34a94d6b37
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/file_dlg.c
View File

@ -771,6 +771,9 @@ file_merge_cmd(GtkWidget *w)
return;
}
/* Default to saving all packets, in the file's current format. */
filetype = cfile.cd_t;
file_merge_w = file_selection_new("Ethereal: Merge with Capture File",
FILE_SELECTION_OPEN);
#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2