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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e4da14977391dd8e24631aaadeb8e4d5d231441b
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

e4da149 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Qt: do not clear display filter when merging files
    
    The merge file dialog box contains a read filter, not a display filter.
    
    Bug: 11713
    Change-Id: Iff160e552e0440ea4c626d54d834d32f38dc54c2
    Reviewed-on: https://code.wireshark.org/review/11875
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 4224aab3453ab98c76d80bebae6301aa7c962fe3)
    Reviewed-on: https://code.wireshark.org/review/11884
    

Actions performed:

    from  556cc71   For now, call the finish routine in Lua file writers "close".
    adds  e4da149   Qt: do not clear display filter when merging files


Summary of changes:
 ui/qt/main_window.cpp |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)