From 995672e8b6902cd3382ee2af8c36be1ca34ba126 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Tue, 4 Feb 2020 13:51:51 +0000 Subject: [PATCH] Qt: allow Resolved Addresses search filter to be cleared Allow the filter in the Resolved Address dialog to be cleared to disable filtering without requiring the dialog to be reopened. Change-Id: I8164d42ac763f8b7faf23821633e129feba69790 Fixes: v3.1.1rc0-244-g743f8598cd0b ("Qt: Rework Resolved Addresses dialog") Reviewed-on: https://code.wireshark.org/review/36027 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall --- ui/qt/resolved_addresses_dialog.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/qt/resolved_addresses_dialog.cpp b/ui/qt/resolved_addresses_dialog.cpp index 66cf39c3b8..e14ac35904 100644 --- a/ui/qt/resolved_addresses_dialog.cpp +++ b/ui/qt/resolved_addresses_dialog.cpp @@ -131,10 +131,11 @@ void ResolvedAddressesDialog::on_cmbDataType_currentIndexChanged(QString) void ResolvedAddressesDialog::on_txtSearchFilter_textChanged(QString) { - if (! ethSortModel || ui->txtSearchFilter->text().length() < 3) + QString filter = ui->txtSearchFilter->text(); + if (!ethSortModel || (!filter.isEmpty() && filter.length() < 3)) return; - ethSortModel->setFilter(ui->txtSearchFilter->text()); + ethSortModel->setFilter(filter); } void ResolvedAddressesDialog::on_cmbPortFilterType_currentIndexChanged(QString)