diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2018-09-28 23:45:35 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2018-09-29 10:27:01 +0000 |
| commit | b0dd361d4899ee6a3fda4ecbcee3d9b197c342be (patch) | |
| tree | 9bb0414471520b30f6aecbc1ed1be49b282da3f8 /epan/color_filters.c | |
| parent | e804e63d4dc7fcf7893d32cd0c420f1736840aeb (diff) | |
prefs: Don't remove unknown coloring rules.
When saving the colorfilters file, keep and disable unknown coloring
rules instead of removing them. The user may want to correct the syntax.
Change-Id: Ib27612a0601276b6ebbb467d7d253f3f72103d1c
Reviewed-on: https://code.wireshark.org/review/29908
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/color_filters.c')
| -rw-r--r-- | epan/color_filters.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/color_filters.c b/epan/color_filters.c index 54cfd4b5b0..4d3bd098f7 100644 --- a/epan/color_filters.c +++ b/epan/color_filters.c @@ -410,12 +410,12 @@ color_filter_validate_cb(gpointer filter_arg, gpointer err) if (colorf->disabled) return; if (!dfilter_compile(colorf->filter_text, &colorf->c_colorfilter, &local_err_msg)) { - *err_msg = g_strdup_printf("Removing color filter name: \"%s\" text: \"%s\".\n%s", + *err_msg = g_strdup_printf("Disabling color filter name: \"%s\" filter: \"%s\".\n%s", colorf->filter_name, colorf->filter_text, local_err_msg); g_free(local_err_msg); - /* Delete the color filter from the list of color filters. */ - color_filter_valid_list = g_slist_remove(color_filter_valid_list, colorf); - color_filter_delete(colorf); + + /* Disable the color filter in the list of color filters. */ + colorf->disabled = TRUE; } } |