Tap parameter and stats dialog fixups.

If we run into an error when trying to register a tap listener, return
instead of tapping packets. This should fix some (but likely not all)
double frees found by Stig. For now close each statistics dialog if we
find an error. Note that we might want to keep them open instead.

Add checks and cleanups to some of the stats table free routines.

Call fillTree once in TapParameterDialog's constructor instead of each
time it's shown. Make fillTree a slot which lets us use a delay timer so
that the dialog is visible when we retap packets.

Change-Id: Id49f2f2a99bc8e5b1d32990024986b3c8b1abe24
Reviewed-on: https://code.wireshark.org/review/10153
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/ui/qt/tap_parameter_dialog.h b/ui/qt/tap_parameter_dialog.h
index 281274b298..5d9354bf5b 100644
--- a/ui/qt/tap_parameter_dialog.h
+++ b/ui/qt/tap_parameter_dialog.h
@@ -76,7 +76,6 @@ signals:
 public slots:
 
 protected:
-    void showEvent(QShowEvent *);
     void contextMenuEvent(QContextMenuEvent *event);
     void addFilterActions();
     QString displayFilter();
@@ -97,14 +96,15 @@ private:
     static const QString action_name_;
     bool retap_on_show_;
 
-    // Called by the constructor. The subclass should tap packets here.
-    virtual void fillTree() = 0;
     virtual const QString filterExpression() { return QString(); }
     QString itemDataToPlain(QVariant var, int width = 0);
     virtual QList<QVariant> treeItemData(QTreeWidgetItem *) const;
     virtual QByteArray getTreeAsString(st_format_type format);
 
 private slots:
+    // Called by the constructor. The subclass should tap packets here.
+    virtual void fillTree() = 0;
+
     void on_applyFilterButton_clicked();
     void on_actionCopyToClipboard_triggered();
     void on_actionSaveAs_triggered();