diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-26 08:30:44 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-26 18:43:32 +0000 |
| commit | c90acf26f88411e62f4200032665f570fe1675c6 (patch) | |
| tree | d64a2d65bca620c2993b08e2e63d2231b43a7220 /ui/qt | |
| parent | 69337f1fe8eea37d25cb6d3890022e71ae2aff4e (diff) | |
Qt: Capture fixes.
Don't check syntax when we rebuild the CaptureFilterCombo.
Make sure we switch back to the main window when capturing fails.
Change-Id: Id4137e33a8135645f29ca7b2836c76b90f09e3ac
Reviewed-on: https://code.wireshark.org/review/4311
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/capture_filter_combo.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ui/qt/capture_filter_combo.cpp b/ui/qt/capture_filter_combo.cpp index 16af78d2c8..923424d892 100644 --- a/ui/qt/capture_filter_combo.cpp +++ b/ui/qt/capture_filter_combo.cpp @@ -111,11 +111,13 @@ void CaptureFilterCombo::rebuildFilterList(bool insert_edit_text) recent_add_cfilter(NULL, currentText().toUtf8().constData()); } + lineEdit()->blockSignals(true); clear(); for (GList *li = g_list_first(cfilter_list); li != NULL; li = g_list_next(li)) { insertItem(0, (const gchar *) li->data); } - setEditText(cur_filter); + lineEdit()->setText(cur_filter); + lineEdit()->blockSignals(false); } /* diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 92f4ab18aa..e0657e26f2 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -455,6 +455,7 @@ void MainWindow::captureCaptureFailed(capture_session *cap_session) { capture_stopping_ = false; setForCaptureInProgress(false); + main_ui_->mainStack->setCurrentWidget(main_welcome_); setWindowIcon(wsApp->normalIcon()); #endif // HAVE_LIBPCAP |