diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-01-20 16:05:56 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-21 06:50:30 +0000 |
| commit | 05fbb4826bcb182cc3895874a15585a96703ce1f (patch) | |
| tree | 448763b393a9ba79c49df7d98c94a77a9e05849d /ui/gtk/drag_and_drop.c | |
| parent | 317649f94984cf3d17f2a57badebb78d7703cdb5 (diff) | |
Qt: Show merge progress.
Add "file merge" callback plumbing. Use it to display "Merging files" in
the main statusbar.
Make sure we have a usable window pointer when we merge files.
Change-Id: I236b6edb30685f0b06703ab8304bc88ae592f83c
Reviewed-on: https://code.wireshark.org/review/19716
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/drag_and_drop.c')
| -rw-r--r-- | ui/gtk/drag_and_drop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index 4c34d29258..84479d0908 100644 --- a/ui/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.c @@ -208,7 +208,7 @@ dnd_open_file_cmd(gchar *cf_names_freeme) } } else { /* merge the files in chronological order */ - if (cf_merge_files_to_tempfile(&tmpname, in_file_count, in_filenames, + if (cf_merge_files_to_tempfile(top_level, &tmpname, in_file_count, in_filenames, WTAP_FILE_TYPE_SUBTYPE_PCAPNG, FALSE) == CF_OK) { /* Merge succeeded; close the currently-open file and try to open the merged capture file. */ |