Wireshark · Wireshark-commits: [Wireshark-commits] master 07c73ad: Qt: Fix restart capture when using a ring buffer

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=07c73adaee2313e4c8e289212d048bdc013c0075
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

07c73ad by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    Qt: Fix restart capture when using a ring buffer
    
    Set capture_opts->restart before restart current capture.
    
    Update the restart handling in capture_input_closed() to not remove
    the current save file; this is either the last file in a ring buffer
    or a temporary file which will be reused later. Also remove the code
    which starts the capture again because this is now done in
    MainWindow::on_actionCaptureRestart_triggered().
    
    Keep the code to restore the original save file when having a ring
    buffer. This will avoid the error message "Ring buffer requested,
    but capture isn't being saved to a permanent file" and a following
    unwanted capture stop.
    
    This fix will also avoid the "No packets captured" warning when
    restart capture without having any packets captured.
    
    Remove the unused capture_restart() function which was used in GTK.
    
    Change-Id: I80802217b71810eaa36b78a2eb4c32697ddc92ce
    Reviewed-on: https://code.wireshark.org/review/32110
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  1df39d6   Qt: Fix removal of "Capture to a permanent file" setting
     add  07c73ad   Qt: Fix restart capture when using a ring buffer


Summary of changes:
 ui/capture.c                | 30 ------------------------------
 ui/capture.h                |  4 ----
 ui/qt/main_window_slots.cpp |  2 +-
 3 files changed, 1 insertion(+), 35 deletions(-)