diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-16 17:20:40 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-16 20:40:08 +0000 |
| commit | 4224aab3453ab98c76d80bebae6301aa7c962fe3 (patch) | |
| tree | e35e243be021ed78a4a65f2a8b0a6928779ff979 | |
| parent | 95fd55e56ba39b3b3b844a7ff65a418eced62ab2 (diff) | |
Qt: do not clear display filter when merging files
The merge file dialog box contains a read filter, not a display filter.
Bug: 11713
Change-Id: Iff160e552e0440ea4c626d54d834d32f38dc54c2
Reviewed-on: https://code.wireshark.org/review/11875
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | ui/qt/main_window.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index f0bacdd7e3..37a69c7af8 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -883,7 +883,7 @@ void MainWindow::thaw() void MainWindow::mergeCaptureFile() { QString file_name = ""; - QString display_filter = ""; + QString read_filter = ""; dfilter_t *rfcode = NULL; int err; @@ -933,7 +933,7 @@ void MainWindow::mergeCaptureFile() } for (;;) { - CaptureFileDialog merge_dlg(this, capture_file_.capFile(), display_filter); + CaptureFileDialog merge_dlg(this, capture_file_.capFile(), read_filter); int file_type; cf_status_t merge_status; char *in_filenames[2]; @@ -962,14 +962,14 @@ void MainWindow::mergeCaptureFile() if (merge_dlg.merge(file_name)) { gchar *err_msg; - if (dfilter_compile(display_filter.toUtf8().constData(), &rfcode, &err_msg)) { + if (dfilter_compile(read_filter.toUtf8().constData(), &rfcode, &err_msg)) { cf_set_rfcode(capture_file_.capFile(), rfcode); } else { /* Not valid. Tell the user, and go back and run the file selection box again once they dismiss the alert. */ - //bad_dfilter_alert_box(top_level, display_filter->str); - QMessageBox::warning(this, tr("Invalid Display Filter"), - QString(tr("The filter expression %1 isn't a valid display filter. (%2).").arg(display_filter, err_msg)), + //bad_dfilter_alert_box(top_level, read_filter->str); + QMessageBox::warning(this, tr("Invalid Read Filter"), + QString(tr("The filter expression %1 isn't a valid read filter. (%2).").arg(read_filter, err_msg)), QMessageBox::Ok); g_free(err_msg); continue; @@ -1050,7 +1050,6 @@ void MainWindow::mergeCaptureFile() "get_dirname()" does write over its argument. */ wsApp->setLastOpenDir(get_dirname(tmpname)); g_free(tmpname); - df_combo_box_->setEditText(display_filter); main_ui_->statusBar->showExpert(); return; } |