[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=10c867b6edb4150cf926fd74895a265b837feaef
Submitter: "Stig Bjørlykke <stig@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

10c867b by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    prefs: Improve check for visible custom columns
    
    Add a check for the resolved setting when searching for hidden columns
    in prefs_is_column_visible(). This allows hiding one of two equal custom
    columns where the only difference is the resolved setting.
    
    Change-Id: Iafb4ffa7bf258948fbe973e038bbeb26d6e8d2e3
    Reviewed-on: https://code.wireshark.org/review/29433
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    (cherry picked from commit 2f297457af98a03842f751184ce6d5d3c017e785)
    Reviewed-on: https://code.wireshark.org/review/29434
    

Actions performed:

    from  28f956c   proto: Reset handled occurrences counter
     add  10c867b   prefs: Improve check for visible custom columns


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