diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-30 12:59:51 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-30 20:04:44 +0000 |
| commit | 00509025e8341dcb9a3bbf74129ad41335c93133 (patch) | |
| tree | 7d9805437c8d62d5f4f739f72bcccf028d54cbe9 | |
| parent | 9fdc85d6c081c171eabdc4e6c77f59af3abb5b05 (diff) | |
Qt: Finish implementing -g
Should fix the current dist failure.
Change-Id: Ib1b8d92f6267040c9eef2e4c27ca78c6dd0631be
Reviewed-on: https://code.wireshark.org/review/4384
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | ui/qt/main.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index d7fac653ea..c742bbaf6f 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -1359,10 +1359,6 @@ int main(int argc, char *argv[]) /* user could specify filename, or display filter, or both */ if (!cf_name.isEmpty()) { - // XXX We need to call cf_open + start_requested_stats + cf_read - // similar to gtk/main.c:3110. - main_w->openCaptureFile(cf_name, display_filter, in_file_type); - /* Open stat windows; we do so after creating the main window, to avoid Qt warnings, and after successfully opening the capture file, so we know we have something to compute stats @@ -1371,6 +1367,14 @@ int main(int argc, char *argv[]) with one of MATE's late-registered fields as part of the filter. */ start_requested_stats(); + + // XXX The GTK+ UI does error checking here. + main_w->openCaptureFile(cf_name, display_filter, in_file_type); + if(go_to_packet != 0) { + /* Jump to the specified frame number, kept for backward + compatibility. */ + cf_goto_frame(&cfile, go_to_packet); + } } #ifdef HAVE_LIBPCAP else { |