Wireshark-commits: [Wireshark-commits] master-2.0 e6908ce: Qt: Fix Follow Dialog crash.
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: Tue, 17 Nov 2015 17:30:42 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e6908ce417ea32b8d57128c7db2df75f78d80d6b
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

e6908ce by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: Fix Follow Dialog crash.
    
    Don't set WA_DeleteOnClose. This keeps the dialog from deleting itself
    when we're inside a nested event loop (i.e. when we're reassembling
    (TCP) or retapping (UDP or TLS)).
    
    Make sure our beginRetapPackets() and endRetapPackets() calls are
    balanced.  Move updateWidgets() calls to follow() so that we update on
    the first run.
    
    Bug: 11711
    Change-Id: Id585be410a315b914b27f1a116d451c863087b00
    Reviewed-on: https://code.wireshark.org/review/11892
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit a18f8c84cf4e8cd98a44ce3019d25fb48dc7b23e)
    Reviewed-on: https://code.wireshark.org/review/11915
    

Actions performed:

    from  8a31ba6   extcap: fix a crash introduced in g622603b
    adds  e6908ce   Qt: Fix Follow Dialog crash.


Summary of changes:
 ui/qt/follow_stream_dialog.cpp |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)