diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-16 23:15:03 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-19 14:22:56 +0000 |
| commit | 444dfda793784cecda0757cbe50e27a5ba855ba0 (patch) | |
| tree | ec34e5780c2dbe29bc2f170c2fc406ee20aa0430 /wireshark-qt.cpp | |
| parent | 7baac67149a68b66087c5d688dbeda2869485765 (diff) | |
Allow "capture info data" to not be a singleton.
It was buried as a static variable in capture_info.c, and functions were refactored to allow a pointer to the info_data_t structure to be passed in. TShark and GTK will have their own single (global) copy of the structure, while it opens up Qt to have multiple instances.
Change-Id: Ic2d7a2ad574de43f457cb18b194d6bc3fffb6120
Reviewed-on: https://code.wireshark.org/review/12691
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index fc9ef0c9d0..ec8b33cbab 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -1409,7 +1409,7 @@ int main(int argc, char *argv[]) if (global_capture_opts.ifaces->len == 0) collect_ifaces(&global_capture_opts); CaptureFile::globalCapFile()->window = main_w; - if (capture_start(&global_capture_opts, main_w->captureSession(), main_window_update)) { + if (capture_start(&global_capture_opts, main_w->captureSession(), main_w->captureInfoData(), main_window_update)) { /* The capture started. Open stat windows; we do so after creating the main window, to avoid GTK warnings, and after successfully opening the capture file, so we know we have something to compute |