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

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>
This commit is contained in:
Pascal Quantin 2015-12-15 09:15:51 +01:00 committed by Alexis La Goutte
parent 9ad40ff6c9
commit 3efc87726c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wireshark-qt.cpp
View File

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