diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-27 06:37:46 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-27 06:37:46 +0000 |
| commit | ab42847049b3e8d78a540e0e874a1d914b9616db (patch) | |
| tree | 2d697a6c076dd8a68eb769b11b024accb59a82d9 /ui | |
| parent | 4e1e60c4bf7d76e87d062cbff1d7454c9eedc1b9 (diff) | |
From Peter Hatina:
We call capture_dlg_prep() and do_file_close() in wrong order. capture_dlg_prep() clears global options for currently running capture and then we get an assertation fail in capture_input_new_packets().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8526
svn path=/trunk/; revision=48581
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/capture_dlg.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index ab9bc216b2..6938aafda1 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -5215,6 +5215,10 @@ capture_start_cb(GtkWidget *w _U_, gpointer d _U_) airpcap_set_toolbar_start_capture(airpcap_if_active); #endif + /* XXX - will closing this remove a temporary file? */ + if(!do_file_close(&cfile, FALSE, " before starting a new capture")){ + return; + } if (cap_open_w) { /* * There's an options dialog; get the values from it and close it. @@ -5238,10 +5242,8 @@ capture_start_cb(GtkWidget *w _U_, gpointer d _U_) "You didn't specify an interface on which to capture packets."); return; } - - /* XXX - will closing this remove a temporary file? */ - if (do_file_close(&cfile, FALSE, " before starting a new capture")) - capture_start_confirmed(); + + capture_start_confirmed(); } |