diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-07-29 10:36:46 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-07-29 20:45:48 +0000 |
| commit | a03a43bd320ceeaae9f2dfa2f15213dced579d17 (patch) | |
| tree | d3e718a58db275b87193fff9d0b4909d31bab0f5 /ui/qt/capture_file.cpp | |
| parent | 5b856134f66f96d1073dd95df9c213cc41869706 (diff) | |
Capture file retapping fixups.
Add CaptureFile::delayedRetapPackets, which starts retapping after the
current batch of UI event are processed. Call it in the constructors of
various dialogs so that they are shown before tapping starts.
This *might* fix a crash found when following large streams from the
Conversations dialog.
Change-Id: If1b87491621ab7efcc0519f95891d34dcd9d18c1
Reviewed-on: https://code.wireshark.org/review/9818
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/capture_file.cpp')
| -rw-r--r-- | ui/qt/capture_file.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp index 82a26d1f19..340d3e1e46 100644 --- a/ui/qt/capture_file.cpp +++ b/ui/qt/capture_file.cpp @@ -36,6 +36,7 @@ capture_file cfile; #include "ui/capture.h" #include <QFileInfo> +#include <QTimer> // To do: // - Add getters and (if needed) setters: @@ -96,6 +97,11 @@ void CaptureFile::retapPackets() } } +void CaptureFile::delayedRetapPackets() +{ + QTimer::singleShot(0, this, SLOT(retapPackets())); +} + void CaptureFile::reload() { if (cap_file_ && cap_file_->state == FILE_READ_DONE) { |