diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-05-20 05:33:18 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-05-20 05:33:18 +0000 |
| commit | 1569217448c1e4c85ac44ecb20cf2f5b79978b72 (patch) | |
| tree | 8fef947a674f073ac0f27d3ccbd2bf964abb5ce5 /epan/prefs.c | |
| parent | 08b0f7296a079773c6ca46695b9837da2e93c5ca (diff) | |
From Cal Turney:
When another profile is selected, its column.hidden preference is ignored.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8696
svn path=/trunk/; revision=49434
Diffstat (limited to 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index 2416437e75..3b9af18f0b 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1315,13 +1315,15 @@ static prefs_set_pref_e column_hidden_set_cb(pref_t* pref, const gchar* value, g fmt_data *cfmt; pref_t *format_pref; - if (*pref->varp.string && (strcmp(*pref->varp.string, value) != 0)) { - *changed = TRUE; - g_free((void *)*pref->varp.string); + if (*pref->varp.string) { + if (strcmp(*pref->varp.string, value) != 0) { + *changed = TRUE; + g_free((void *)*pref->varp.string); + *pref->varp.string = g_strdup(value); + } + } else if (value) { *pref->varp.string = g_strdup(value); - } else { - *pref->varp.string = NULL; - } + } /* * Set the "visible" flag for the existing columns; we need to |