diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-07-29 10:36:46 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-07-29 20:45:48 +0000 |
| commit | a03a43bd320ceeaae9f2dfa2f15213dced579d17 (patch) | |
| tree | d3e718a58db275b87193fff9d0b4909d31bab0f5 /ui/qt/conversation_dialog.cpp | |
| parent | 5b856134f66f96d1073dd95df9c213cc41869706 (diff) | |
| download | wireshark-a03a43bd320ceeaae9f2dfa2f15213dced579d17.tar.gz | |
Capture file retapping fixups.
Add CaptureFile::delayedRetapPackets, which starts retapping after the
current batch of UI event are processed. Call it in the constructors of
various dialogs so that they are shown before tapping starts.
This *might* fix a crash found when following large streams from the
Conversations dialog.
Change-Id: If1b87491621ab7efcc0519f95891d34dcd9d18c1
Reviewed-on: https://code.wireshark.org/review/9818
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/conversation_dialog.cpp')
| -rw-r--r-- | ui/qt/conversation_dialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index 545973f77b..e995b63b5e 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -98,7 +98,7 @@ ConversationDialog::ConversationDialog(QWidget &parent, CaptureFile &cf, int cli updateWidgets(); itemSelectionChanged(); - cap_file_.retapPackets(); + cap_file_.delayedRetapPackets(); } ConversationDialog::~ConversationDialog() @@ -228,7 +228,7 @@ void ConversationDialog::followStream() } emit filterAction(filter, FilterAction::ActionApply, FilterAction::ActionTypePlain); - openFollowStreamDialog(ftype); + emit openFollowStreamDialog(ftype); } void ConversationDialog::graphTcp() |