aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2018-09-28 19:47:33 +0200
committerPeter Wu <peter@lekensteyn.nl>2018-09-29 10:18:16 +0000
commite804e63d4dc7fcf7893d32cd0c420f1736840aeb (patch)
tree9f12b2ef3257121ce013f9e28edbb7d073c08c90
parenta699fbdf45481113470cbc56f89e03cdae730f44 (diff)
prefs: Reset prefs.unknown_colorfilters before reading colorfilters
Reset prefs.unknown_colorfilters in the beginning of read_filters_file() to avoid a situation when the preference is set and never cleared. This will end up with an error message in UI even when not having unknown color filters. Change-Id: I835dbc2a57f0be6889eb5bce250987dabd796e30 Reviewed-on: https://code.wireshark.org/review/29904 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-rw-r--r--epan/color_filters.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/color_filters.c b/epan/color_filters.c
index 03f499d74e..54cfd4b5b0 100644
--- a/epan/color_filters.c
+++ b/epan/color_filters.c
@@ -534,6 +534,8 @@ read_filters_file(const gchar *path, FILE *f, gpointer user_data, color_filter_a
name = (gchar *)g_malloc(name_len + 1);
filter_exp = (gchar *)g_malloc(filter_exp_len + 1);
+ prefs.unknown_colorfilters = FALSE;
+
while (1) {
if (skip_end_of_line) {