diff options
author | Martin Kaiser <wireshark@kaiser.cx> | 2017-12-15 19:18:00 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-12-16 05:21:25 +0000 |
commit | b2e6d615c2817a25d74e1b25629e547586dbfa47 (patch) | |
tree | e2c560292f2ec2cc8b6e7ffaa9b8232b8ca86473 | |
parent | 3d086e638dc0a1713328c23161671555dfa4faaf (diff) |
qt: follow stream: prevent duplicate close
621498f88e882dbe8cc3a2c8373bb342bb0dbe77 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>
-rw-r--r-- | ui/qt/follow_stream_dialog.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp index 136a8e2595..9fc5d93421 100644 --- a/ui/qt/follow_stream_dialog.cpp +++ b/ui/qt/follow_stream_dialog.cpp @@ -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(); |