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>

1 files changed, 16 insertions, 5 deletions

diff --git a/ui/qt/capture_file.h b/ui/qt/capture_file.h
index a4b77fdaaf..430933e76f 100644
--- a/ui/qt/capture_file.h
+++ b/ui/qt/capture_file.h
@@ -68,10 +68,6 @@ public:
      */
     const QString fileName();
 
-    /** Retap the capture file
-     */
-    void retapPackets();
-
     /** Re;load the capture file
      */
     void reload();
@@ -107,11 +103,26 @@ signals:
     void captureCaptureFailed(capture_session *cap_session);
 
 public slots:
+    /** Retap the capture file. Convenience wrapper for cf_retap_packets.
+     * Application events are processed periodically via update_progress_dlg.
+     */
+    void retapPackets();
+
+    /** Retap the capture file after the current batch of application events
+     * is processed. If you call this instead of retapPackets or
+     * cf_retap_packets in a dialog's constructor it will be displayed before
+     * tapping starts.
+     */
+    void delayedRetapPackets();
+
     /** Cancel any tapping that might be in progress.
      */
     void stopLoading();
 
-    // XXX Not used.
+    /** Sets the capture file's "stop_flag" member.
+     *
+     * @param stop_flag If true, stops the current capture file operation.
+     */
     void setCaptureStopFlag(bool stop_flag = true);
 
 private: