diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-12-15 09:15:51 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-12-15 10:34:49 +0000 |
| commit | 3efc87726ca29543efd1e413e414703dc87defa8 (patch) | |
| tree | 287e4154b0ab458183adf23ceb746cbe816fe7b5 /wireshark-qt.cpp | |
| parent | 9ad40ff6c91115c9e9cb86f2d257260479e63706 (diff) | |
Qt: apply '-Y' display filter unconditionally and not only when opening a capture file
Bug: 11891
Change-Id: I20c4497bdf255627c845f5d6fba2ad7797815b08
Reviewed-on: https://code.wireshark.org/review/12645
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index dc6db3c681..6f6e6f3669 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -1382,10 +1382,10 @@ int main(int argc, char *argv[]) SimpleDialog::displayQueuedMessages(main_w); /* User could specify filename, or display filter, or both */ + if (!dfilter.isEmpty()) + main_w->filterPackets(dfilter, false); if (!cf_name.isEmpty()) { if (main_w->openCaptureFile(cf_name, read_filter, in_file_type)) { - if (!dfilter.isEmpty()) - main_w->filterPackets(dfilter, false); /* Open stat windows; we do so after creating the main window, to avoid Qt warnings, and after successfully opening the |