Wireshark-commits: [Wireshark-commits] master-2.6 85ebd9e: prefs: Don't remove unknown coloring rul

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 29 Sep 2018 11:51:01 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=85ebd9e4da500a6bab784a4fdaeb76f805ed6e7f
Submitter: "Stig Bjørlykke <stig@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

85ebd9e by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    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@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit b0dd361d4899ee6a3fda4ecbcee3d9b197c342be)
    Reviewed-on: https://code.wireshark.org/review/29918
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    

Actions performed:

    from  64c63c5   prefs: Reset prefs.unknown_colorfilters before reading colorfilters
     add  85ebd9e   prefs: Don't remove unknown coloring rules.


Summary of changes:
 epan/color_filters.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)