aboutsummaryrefslogtreecommitdiffstats
path: root/epan/color_filters.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-07-25 10:49:30 -0700
committerMichael Mann <mmann78@netscape.net>2016-07-29 03:57:41 +0000
commite727ecf5e302c9f765d0038b234e6775fb4ca45b (patch)
treed168ccb59b3bfeebb554580451ea98fc0b509037 /epan/color_filters.c
parent485bc456c57a16dbe50b76c476e48223038bb0e8 (diff)
Don't discard unknown coloring rules.
When processing the colorfilters file, keep and disable unknown coloring rules instead of skipping over and discarding them. This should hopefully keep people from losing the standard "Checksum Errors" rule (and it's less rude in general). Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f Reviewed-on: https://code.wireshark.org/review/16673 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/color_filters.c')
-rw-r--r--epan/color_filters.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/color_filters.c b/epan/color_filters.c
index d3e329b94c..ee99ea0a62 100644
--- a/epan/color_filters.c
+++ b/epan/color_filters.c
@@ -627,8 +627,8 @@ read_filters_file(FILE *f, gpointer user_data, color_filter_add_cb_func add_cb)
g_free(local_err_msg);
prefs.unknown_colorfilters = TRUE;
- skip_end_of_line = TRUE;
- continue;
+ /* skip_end_of_line = TRUE; */
+ disabled = TRUE;
}
fg_color.red = fg_r;