Wireshark-commits: [Wireshark-commits] master-2.2 6d29c12: Qt: Preserve capture filter when prefere

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 2 Sep 2016 20:22:04 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6d29c126de4461fa6f161ff47620664a4cedbf48
Submitter: Stig Bjørlykke (stig@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

6d29c12 by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    Qt: Preserve capture filter when preferences changed
    
    Avoid that the last entry from recent.capture_filter is added to the
    capture filter combo when editing preferences or changing profile.
    
    This bug was introduced in gb7897dde.
    
    Change-Id: I38a32386765c9e7ffaa93d006ff0ef7b78ac8252
    Reviewed-on: https://code.wireshark.org/review/17453
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 770aaf1dde2c57687beb0ebe9a3af9003c3c2c14)
    Reviewed-on: https://code.wireshark.org/review/17468
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    

Actions performed:

    from  a6bd069   diam_dict.l: remove use of strdup
    adds  6d29c12   Qt: Preserve capture filter when preferences changed


Summary of changes:
 ui/qt/capture_filter_combo.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)