diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-23 16:39:52 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-24 16:25:40 +0000 |
| commit | 8fc2327766146184852439fac19a769a097f7c85 (patch) | |
| tree | 57ac8e56a1f956e8f9573ebee7ffab69af17de6e /epan/prefs.c | |
| parent | ffe30fb0d3ee0ebe6f149cc4d8bbd189891bcaf0 (diff) | |
Qt: Fix preference bugs.
Make sure we set the "resolved" member of the column fmt_data struct.
Emitting WiresharkApplication::AppSignals from a modal dialog can cause
event loop problems on OS X. Queue them up in PreferencesDialog and emit
them after closing.
Change-Id: I2de77778a0448db3b87d402e431b8e5f325cbbda
Reviewed-on: https://code.wireshark.org/review/4274
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index f8a889666a..9c67bb7156 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -2794,9 +2794,9 @@ parse_column_format(fmt_data *cfmt, const char *fmt) gchar **cust_format_info; char *p; int col_fmt; - gchar *col_custom_field; - long col_custom_occurrence; - gboolean col_resolved; + gchar *col_custom_field = NULL; + long col_custom_occurrence = 0; + gboolean col_resolved = TRUE; /* * Is this a custom column? @@ -2815,22 +2815,15 @@ parse_column_format(fmt_data *cfmt, const char *fmt) g_strfreev(cust_format_info); return FALSE; } - } else { - col_custom_occurrence = 0; } if (col_custom_field && cust_format_info[1] && cust_format_info[2]) { col_resolved = (cust_format_info[2][0] == 'U') ? FALSE : TRUE; - } else { - col_resolved = TRUE; } g_strfreev(cust_format_info); } else { col_fmt = get_column_format_from_str(fmt); if (col_fmt == -1) return FALSE; - col_custom_field = NULL; - col_custom_occurrence = 0; - col_resolved = TRUE; } cfmt->fmt = col_fmt; |