From d01a2ac0727ec6a9825e40a01ee77a216d488b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Tue, 18 Mar 2008 00:11:52 +0000 Subject: [PATCH] Bah, committed the wrong file. Second try on allow custom columns when printing. svn path=/trunk/; revision=24682 --- file.c | 4 ++-- 1 file 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. */