Qt: Apply protocol preferences.

Make sure we call prefs_apply_all when saving preferences.

Bug: 11119
Change-Id: Iacf1e28e69c2aebcbbd7dceaa210c8219663665f
Reviewed-on: https://code.wireshark.org/review/8462
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp
index 46db04d345..b69435e459 100644
--- a/ui/qt/preferences_dialog.cpp
+++ b/ui/qt/preferences_dialog.cpp
@@ -814,6 +814,14 @@ void PreferencesDialog::on_buttonBox_accepted()
   //airpcap_load_decryption_keys(airpcap_if_list);
 #endif
 
+    // gtk/prefs_dlg.c:prefs_main_apply_all
+    /*
+     * Apply the protocol preferences first - "gui_prefs_apply()" could
+     * cause redissection, and we have to make sure the protocol
+     * preference changes have been fully applied.
+     */
+    prefs_apply_all();
+
     /* Fill in capture options with values from the preferences */
     prefs_to_capture_opts();