diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-08-26 11:24:29 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-08-26 22:02:19 +0000 |
| commit | 374439daa17fe2692746857b920616354ce658e7 (patch) | |
| tree | e9857e674c25918585b918ca8521354a957a15a2 /ui/qt/protocol_preferences_menu.cpp | |
| parent | 8ad56117502207d95d54bd2c8dff24d001530d24 (diff) | |
Don't emit app signals from dialogs.
Emitting PacketDissectionChanged from a dialog on can render the main
window unusable on OS X. A workaround for this was added to the
preferences dialog in g8fc2327. Generalize the workaround and use it
elsewhere.
Fix the "Enabled Protocols" action name while we're here.
Bug: 11361
Bug: 11448
Change-Id: I89e98daaaedc877d3b13b0d33b6f3be033e323d7
Reviewed-on: https://code.wireshark.org/review/10271
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/protocol_preferences_menu.cpp')
| -rw-r--r-- | ui/qt/protocol_preferences_menu.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/qt/protocol_preferences_menu.cpp b/ui/qt/protocol_preferences_menu.cpp index 12999ec89b..600f0c4bc9 100644 --- a/ui/qt/protocol_preferences_menu.cpp +++ b/ui/qt/protocol_preferences_menu.cpp @@ -101,6 +101,9 @@ public: void showUatDialog() { UatDialog uat_dlg(parentWidget(), pref_->varp.uat); uat_dlg.exec(); + // Emitting PacketDissectionChanged directly from a QDialog can cause + // problems on OS X. + wsApp->flushAppSignals(); } private: |