diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2015-11-19 19:54:41 +0100 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2015-11-20 07:57:25 +0000 |
commit | 0ae19656e12089271ea5941bcb4663bedc337b69 (patch) | |
tree | f7fe02922d7b58f389acdf84cbb0bac50cbd7a9f /ui/qt/wireshark_application.cpp | |
parent | c297df134b4ba7afc84272a8c425a852e4b5408a (diff) |
Qt: Fixed column issues when changing profile.
Always initialize prefs.col_list in pre_init_prefs.
When switching to a profile without a saved 'preferences' file we
have to initialize prefs.col_list to default values to avoid reusing
settings from the profile we leave.
This was introduced in 5012cf84e6d84a448171dac64c14d9c83e3d4ae6
Emit columnsChanged() before preferencesChanged().
This because columnsChanged() rebuilds cap_file_->cinfo which is used
in preferencesChanged() to align columns (and possible other actions).
Doing this in the wrong order will give an inconsistency and a
heap-buffer-overflow if having different number of columns.
Bug: 11493
Change-Id: I5792dfc0ede11b9457b96f092af8da00453787b1
Reviewed-on: https://code.wireshark.org/review/11971
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'ui/qt/wireshark_application.cpp')
-rw-r--r-- | ui/qt/wireshark_application.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index 083d3fde0d..7d8b06367d 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -373,8 +373,8 @@ void WiresharkApplication::setConfigurationProfile(const gchar *profile_name) prefs_to_capture_opts(); prefs_apply_all(); - emit preferencesChanged(); emit columnsChanged(); + emit preferencesChanged(); emit recentFilesRead(); emit filterExpressionsChanged(); // macros_post_update(); |