diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-20 13:44:27 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-20 23:16:54 +0000 |
| commit | ead79e6aa15210cf83032698d7d17eb54a3d0857 (patch) | |
| tree | 99484c25885f5c277f8cb4b2a54d7fac2534b51a /epan/prefs.c | |
| parent | 422ad100aad4c076ab05f1373dad59481ea12072 (diff) | |
Clear the filter expression list in prefs.c.
Move filter_expression_nuke from ui/gtk to epan and rename it to
filter_expression_free. Call it in prefs_reset along with the other
preference reset routines.
This keeps the Qt filter toolbar from filling up with duplicate
expressions when the profile changes.
Change-Id: I9fae9a7b48944079ea342a126979d9e79af0d22b
Reviewed-on: https://code.wireshark.org/review/7281
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 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index 43c3d6948c..028fee457a 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -3125,6 +3125,13 @@ prefs_reset(void) oids_cleanup(); /* + * Free the filter expression list. + */ + + filter_expression_free(*pfilter_expression_head); + *pfilter_expression_head = NULL; + + /* * Reset the non-dissector preferences. */ init_prefs(); |