osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

qt: follow stream: prevent duplicate close 

621498f88e fixed a crash that's caused by
closing the follow stream dialogue multiple times. Another way to get a
similar crash is to press the Back or "Filter out this stream" buttons
again while we're already about to close.

Ignore the two buttons in this case.

Change-Id: Ia8d7b3ca500db2519a784b42c0744e2527b9d5f6
Reviewed-on: https://code.wireshark.org/review/24839
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Martin Kaiser 2017-12-15 19:18:00 +01:00 committed by Michael Mann
parent 3d086e638d
commit b2e6d615c2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/qt/follow_stream_dialog.cpp
View File

@ -305,6 +305,9 @@ void FollowStreamDialog::helpButton()
void FollowStreamDialog::backButton()
{
if (terminating_)
return;
output_filter_ = previous_filter_;
close();
@ -312,6 +315,9 @@ void FollowStreamDialog::backButton()
void FollowStreamDialog::filterOut()
{
if (terminating_)
return;
output_filter_ = filter_out_filter_;
close();