aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2016-02-03 23:10:40 +0100
committerAnders Broman <a.broman58@gmail.com>2016-02-05 05:35:02 +0000
commitcc679ca5ce9af9fb0dc9afe360d12654f6b4027a (patch)
treee68fdf9627cfbfbb4a827721d7a2db0d1f2cf421 /ui
parent4c144c5d8c4c3f289a8b89a19bb9843cf9584d0e (diff)
Qt: Add check for field extractors
The proto tree is needed in several cases when using Lua field extractors, because they fetch values from the tree. Without a valid field extractor a Lua plugin may misbehave and display wrong column info. This fixes column issues when: - Calling resetColumns() in Qt. This involves adding a display filter, change time display format, change name resolution and other changes in UI which requires column updates. - Print summary lines. - Export as CSV and PSML. Change-Id: Ieed6f8578cdf2759f1f836cd8413a4529b7bbd80 Reviewed-on: https://code.wireshark.org/review/13708 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/packet_list_record.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/qt/packet_list_record.cpp b/ui/qt/packet_list_record.cpp
index 8fab6f03f9..7317b9bae9 100644
--- a/ui/qt/packet_list_record.cpp
+++ b/ui/qt/packet_list_record.cpp
@@ -133,8 +133,9 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color)
return; /* error reading the record */
}
- create_proto_tree = (dissect_color && color_filters_used()) ||
- (dissect_columns && have_custom_cols(cinfo));
+ create_proto_tree = ((dissect_color && color_filters_used()) ||
+ (dissect_columns && (have_custom_cols(cinfo) ||
+ have_field_extractors())));
epan_dissect_init(&edt, cap_file->epan,
create_proto_tree,