diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-06-12 14:23:32 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-06-17 14:22:04 +0000 |
| commit | 800a856fb4784e31347e15a8ec825d2daeb62350 (patch) | |
| tree | ebae2acc27bfad4087621de584cd6584565c8a15 /ui/ui_util.h | |
| parent | 6462560b30635b79abc7d248dbf53179f31d84a7 (diff) | |
| download | wireshark-800a856fb4784e31347e15a8ec825d2daeb62350.tar.gz | |
Qt: fix hang on exiting Qt while loading capture file
testCaptureFileClose can also be invoked while reading an existing
capture file (the original comment only applied to GTK+, not Qt). When
the user quits Wireshark while reading an offline pcap, this could
result in a confusing "Unsaved packets" dialog. Fix this by checking the
actual capture session state.
After fixing this, the next issue is that cf_close trips on an assertion
("cf->state != FILE_READ_IN_PROGRESS"). To address this problem, do not
close the capture file immediately, but signal to the reader (cf_read)
that this should be done (similar to the quit logic in GTK+).
Bug: 13563
Change-Id: I12d4b813557bf354199320df2ed8609070fdc58a
Reviewed-on: https://code.wireshark.org/review/22096
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'ui/ui_util.h')
0 files changed, 0 insertions, 0 deletions