When merging, default to the current file format as the output format.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 17 Oct 2004 03:11:31 +0000 (03:11 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 17 Oct 2004 03:11:31 +0000 (03:11 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12327 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/file_dlg.c

index 202670319db5d17ce7c45f5feb058ef86a38da52..819c3719ce6686a23bb8df91cf1872298e832083 100644 (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