diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2016-09-02 14:10:31 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-09-02 20:02:45 +0000 |
| commit | 770aaf1dde2c57687beb0ebe9a3af9003c3c2c14 (patch) | |
| tree | 95c6b324f963b3c185a87c6d3130e80bd806b36b | |
| parent | 893e0e96084fe0e559310d117fb953ddf08c0d6e (diff) | |
Qt: Preserve capture filter when preferences changed
Avoid that the last entry from recent.capture_filter is added to the
capture filter combo when editing preferences or changing profile.
This bug was introduced in gb7897dde.
Change-Id: I38a32386765c9e7ffaa93d006ff0ef7b78ac8252
Reviewed-on: https://code.wireshark.org/review/17453
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | ui/qt/capture_filter_combo.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/qt/capture_filter_combo.cpp b/ui/qt/capture_filter_combo.cpp index 89dcdc4fdc..2f8ba301e8 100644 --- a/ui/qt/capture_filter_combo.cpp +++ b/ui/qt/capture_filter_combo.cpp @@ -91,7 +91,8 @@ CaptureFilterCombo::CaptureFilterCombo(QWidget *parent, bool plain) : clearEditText(); } -void CaptureFilterCombo::writeRecent(FILE *rf) { +void CaptureFilterCombo::writeRecent(FILE *rf) +{ int i; for (i = 0; i < count(); i++) { @@ -109,14 +110,17 @@ void CaptureFilterCombo::saveAndRebuildFilterList() } rebuildFilterList(); } + void CaptureFilterCombo::rebuildFilterList() { lineEdit()->blockSignals(true); GList *cfilter_list = recent_get_cfilter_list(NULL); + QString cur_filter = currentText(); clear(); for (GList *li = g_list_first(cfilter_list); li != NULL; li = g_list_next(li)) { insertItem(0, (const gchar *) li->data); } + lineEdit()->setText(cur_filter); lineEdit()->blockSignals(false); } |