aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2016-12-03 23:41:08 +0100
committerPeter Wu <peter@lekensteyn.nl>2016-12-04 11:25:36 +0000
commit5721a87330f8afe3fed12d4af250d7a3d219cbe2 (patch)
treebd98ee681bb200ecff82cf2ee776aa0461f5ba03
parent40ebfb9a6f180b5b6deb0ed727e38c98e848b6cb (diff)
Qt: clear Export Objects list on retapping
The tap reset callback should not just invoke the reset callback of the dissector, but also clear the previous list of objects in the dialog. Otherwise duplicate entries will be created every time retapping occurs (e.g. on changing the display filter). Bug: 12230 Change-Id: I75f25db0652dcc9c0ac59ab0e536c06874aedb9c Reviewed-on: https://code.wireshark.org/review/19055 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-rw-r--r--ui/qt/export_object_dialog.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp
index 8592332feb..a7af4bd9c7 100644
--- a/ui/qt/export_object_dialog.cpp
+++ b/ui/qt/export_object_dialog.cpp
@@ -215,6 +215,9 @@ export_object_entry_t *ExportObjectDialog::objectEntry(int row)
void ExportObjectDialog::resetObjects()
{
export_object_gui_reset_cb reset_cb = get_eo_reset_func(eo_);
+
+ eo_ui_->objectTree->clear();
+
if (reset_cb)
reset_cb();