diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-06-22 12:44:02 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-23 03:44:54 +0000 |
| commit | 300e055ab6e3ede51de2258c83d9aeab4b7f3701 (patch) | |
| tree | 0db3e2c2984b3e3a7d47207cc13c35de0ecc77e5 /ui/qt/protocol_hierarchy_dialog.h | |
| parent | 933c079598079e1786b07cda5e1b48684ca0ac3c (diff) | |
Qt: Use queued signals+slots for filter actions
Many of our dialogs can send an "apply this display filter" signal to
the main window. Applying a display filter in turn creates a nested
event loop via cf_read+update_progress_dlg. If the "apply" signal+slot
is directly connected (which is the default, and which means we're
calling into a function table) we can close the dialog while the signal
is firing, which means we return into a deleted object.
Make all of the filterAction signals+slots queued instead of direct.
Bug: 12523
Change-Id: Ica331054c0aa52a7f33bd8df1fa65ecd09fdc292
Reviewed-on: https://code.wireshark.org/review/16080
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/protocol_hierarchy_dialog.h')
| -rw-r--r-- | ui/qt/protocol_hierarchy_dialog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/protocol_hierarchy_dialog.h b/ui/qt/protocol_hierarchy_dialog.h index b3963cd4df..6814e59041 100644 --- a/ui/qt/protocol_hierarchy_dialog.h +++ b/ui/qt/protocol_hierarchy_dialog.h @@ -44,7 +44,7 @@ public: ~ProtocolHierarchyDialog(); signals: - void filterAction(QString& filter, FilterAction::Action action, FilterAction::ActionType type); + void filterAction(QString filter, FilterAction::Action action, FilterAction::ActionType type); private slots: void showProtoHierMenu(QPoint pos); |