aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tshark.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tshark.c b/tshark.c
index 6d1489a3be..4b363c3b8e 100644
--- a/tshark.c
+++ b/tshark.c
@@ -3055,7 +3055,7 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, frame_data *fd
2) we're printing packet info but we're *not* verbose; in verbose
mode, we print the protocol tree, not the protocol summary.
*/
- if ((tap_flags & TL_REQUIRES_COLUMNS) || (print_packet_info && print_summary))
+ if ((tap_flags & TL_REQUIRES_COLUMNS) || (print_packet_info && print_summary) || output_fields_has_cols(output_fields))
cinfo = &cf->cinfo;
else
cinfo = NULL;
@@ -3395,6 +3395,7 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type,
ws_buffer_free(&buf);
}
else {
+ /* !perform_two_pass_analysis */
framenum = 0;
if (do_dissection) {