Wireshark-commits: [Wireshark-commits] master 2440f53: Qt: Fix testCaptureFileClose without packets
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 10 Jan 2016 19:23:31 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2440f534b138934ba40363f039390ad30f94586b
Submitter: Stig Bj?rlykke (stig@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

2440f53 by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    Qt: Fix testCaptureFileClose without packets
    
    In MainWindow::testCaptureFileClose() we must always stop a running
    capture if closing, even if not having any packets, because
    cf_close() will fail (assert) if still in progress.
    
    This fixes an issue (crash) when closing the application with
    a running capture without packets.
    
    This also fixes restarting current capture without packets, both
    with and without "Confirm unsaved capture files".
    
    Bug: 11981
    Change-Id: Id0655fcc799682a4f45c855bc2e76386dffc35a5
    Reviewed-on: https://code.wireshark.org/review/13121
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    

Actions performed:

    from  c6e981b   checkfiltername.pl: Don't print empty line on successful run
    adds  2440f53   Qt: Fix testCaptureFileClose without packets


Summary of changes:
 ui/qt/main_window.cpp       |   57 ++++++++++++++++++-------------------------
 ui/qt/main_window_slots.cpp |    3 +--
 2 files changed, 25 insertions(+), 35 deletions(-)