osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2014-09-26 08:30:44 -07:00
parent 69337f1fe8
commit c90acf26f8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/capture_filter_combo.cpp
View File

@ -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);
}
/*

1
ui/qt/main_window_slots.cpp
View File

@ -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