aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2017-02-03 23:15:56 +0100
committerMichael Mann <mmann78@netscape.net>2017-02-10 13:34:56 +0000
commit9ced31a2d7a78e22454aba5fa1a0f2655e2a57cf (patch)
treee9aab4f6751f3c9c187b805a23138278e3ff154c /ui
parent59fc668845e57cf988226c3c19984c8bd83458d3 (diff)
filter_list: add cleanup function and call it on exit.
Change-Id: I51d8074cc5a63d4fd3af8852df120d6b4163217f Reviewed-on: https://code.wireshark.org/review/19942 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk/main.c1
-rw-r--r--ui/qt/wireshark_application.cpp5
-rw-r--r--ui/qt/wireshark_application.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index b62ffd35b9..ff2751ea5b 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2815,6 +2815,7 @@ clean_exit:
capture_opts_cleanup(&global_capture_opts);
#endif
col_cleanup(&cfile.cinfo);
+ free_filter_lists();
return ret;
}
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index f9bcfd7a83..a136bc3d74 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -716,6 +716,11 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) :
connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(cleanup()));
}
+WiresharkApplication::~WiresharkApplication()
+{
+ free_filter_lists();
+}
+
void WiresharkApplication::registerUpdate(register_action_e action, const char *message)
{
emit splashUpdate(action, message);
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index 9decb77f28..c4b4b786d2 100644
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.h
@@ -60,6 +60,7 @@ class WiresharkApplication : public QApplication
Q_OBJECT
public:
explicit WiresharkApplication(int &argc, char **argv);
+ ~WiresharkApplication();
enum AppSignal {
CaptureFilterListChanged,