Bah, committed the wrong file.

Second try on allow custom columns when printing.

svn path=/trunk/; revision=24682

1 files changed, 2 insertions, 2 deletions

diff --git a/file.c b/file.c
index a7aba46a2f..389cccea63 100644
--- a/file.c
+++ b/file.c
@@ -1929,8 +1929,8 @@ print_packet(capture_file *cf, frame_data *fdata,
      the dissection or the hex data.
      XXX - do we need it if we're just printing the hex data? */
   proto_tree_needed =
-      args->print_args->print_dissections != print_dissections_none || args->print_args->print_hex;
-  edt = epan_dissect_new(proto_tree_needed || have_custom_cols(&cf->cinfo), proto_tree_needed);
+      args->print_args->print_dissections != print_dissections_none || args->print_args->print_hex || have_custom_cols(&cf->cinfo);
+  edt = epan_dissect_new(proto_tree_needed, proto_tree_needed);
 
   /* Fill in the column information if we're printing the summary
      information. */