Allow custom columns in export as CSV and PSML.

svn path=/trunk/; revision=24683

1 files changed, 10 insertions, 4 deletions

diff --git a/file.c b/file.c
index 389cccea63..699729fb8c 100644
--- a/file.c
+++ b/file.c
@@ -2264,9 +2264,12 @@ write_psml_packet(capture_file *cf, frame_data *fdata,
 {
   FILE *fh = argsp;
   epan_dissect_t *edt;
+  gboolean proto_tree_needed;
 
-  /* Fill in the column information, but don't create the protocol tree. */
-  edt = epan_dissect_new(FALSE, FALSE);
+  /* Fill in the column information, only create the protocol tree
+     if having custom columns. */
+  proto_tree_needed = have_custom_cols(&cf->cinfo);
+  edt = epan_dissect_new(proto_tree_needed, proto_tree_needed);
   epan_dissect_run(edt, pseudo_header, pd, fdata, &cf->cinfo);
   epan_dissect_fill_in_columns(edt);
 
@@ -2335,9 +2338,12 @@ write_csv_packet(capture_file *cf, frame_data *fdata,
 {
   FILE *fh = argsp;
   epan_dissect_t *edt;
+  gboolean proto_tree_needed;
 
-  /* Fill in the column information, but don't create the protocol tree. */
-  edt = epan_dissect_new(FALSE, FALSE);
+  /* Fill in the column information, only create the protocol tree
+     if having custom columns. */
+  proto_tree_needed = have_custom_cols(&cf->cinfo);
+  edt = epan_dissect_new(proto_tree_needed, proto_tree_needed);
   epan_dissect_run(edt, pseudo_header, pd, fdata, &cf->cinfo);
   epan_dissect_fill_in_columns(edt);