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

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

Commits:

a4cb6f6 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: Fix a merge crash.
    
    Update the logic in ui/qt/main_window.cpp:mergeCaptureFile to match
    ui/gtk/capture_file_dlg.c:file_merge_cmd. This ensures that we don't try
    to use a stale (and freed) read filter.
    
    Call cf_set_rfcode in both.
    
    Bug: 11718
    Change-Id: I6da65e428bff39e907f45992bac7337880c02ce9
    Reviewed-on: https://code.wireshark.org/review/11895
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 7518a74dbb32f941509a5dcabb5f74a3af14985d)
    Reviewed-on: https://code.wireshark.org/review/11909
    

Actions performed:

    from  e3b1aee   Win32: Try to fix handle leaks in capture_sync.
    adds  a4cb6f6   Qt: Fix a merge crash.


Summary of changes:
 ui/gtk/capture_file_dlg.c |    2 +-
 ui/qt/main_window.cpp     |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)