diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-05-28 14:59:00 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-05-31 10:41:10 +0000 |
| commit | 0add74fcc9b6a4ee433af36f5d796b319ca1f66b (patch) | |
| tree | 158724db6f037b35546b5418ae7850f09af01ab8 /ui/qt/column_preferences_frame.h | |
| parent | 5948eee77d6b0b574f1a8dbe9eb99c4c14f6146f (diff) | |
Restore a preference column type if fields are empty.
The column type is automatically changed to Custom if user clicks
on the "Fields" or "Field Occurrences" column. This can be
accidental and cause the user grief if he doesn't realize it.
If there is no text in the field, restore the type to its
original value.
Bug: 12465
Change-Id: I0453f43be13077aba58cca61011eeff9ca9b83b2
Reviewed-on: https://code.wireshark.org/review/15600
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/column_preferences_frame.h')
| -rw-r--r-- | ui/qt/column_preferences_frame.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/qt/column_preferences_frame.h b/ui/qt/column_preferences_frame.h index 0a7ae664b6..0fcefc2a4a 100644 --- a/ui/qt/column_preferences_frame.h +++ b/ui/qt/column_preferences_frame.h @@ -53,6 +53,7 @@ private: QString saved_col_string_; QComboBox *cur_combo_box_; int saved_combo_idx_; + int saved_custom_combo_idx_; void addColumn(bool visible, const char *title, int fmt, const char *custom_fields, int custom_occurrence); |