From 36a74cb13a7ee8e4e0972243d1a6a9ae641adb03 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 20 Aug 2015 08:56:04 -0700 Subject: 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 --- ui/qt/simple_statistics_dialog.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ui/qt/simple_statistics_dialog.h') diff --git a/ui/qt/simple_statistics_dialog.h b/ui/qt/simple_statistics_dialog.h index 918104e10d..5513112d9e 100644 --- a/ui/qt/simple_statistics_dialog.h +++ b/ui/qt/simple_statistics_dialog.h @@ -49,6 +49,7 @@ private: static void tapReset(void *sd_ptr); static void tapDraw(void *sd_ptr); +private slots: virtual void fillTree(); }; -- cgit v1.2.1