diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-06-05 21:08:31 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-06-05 21:14:08 +0000 |
| commit | 244f2fbbf6c4167c75c4eb626aa8a73208ba3d8e (patch) | |
| tree | 9f80296dccb3bd8efe553279e77f8fd16c3ba678 /ui/gtk | |
| parent | c2b713c0935de91f07faf0674dbb024391531a90 (diff) | |
GTK: fix a crash when switching a column to custom through 'Edit Column Details'
Bug: 11245
Change-Id: I269d4dc8bd1ec23e3e6be4c9432563b8e275c548
Reviewed-on: https://code.wireshark.org/review/8778
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/packet_list.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c index 614123d14d..f9a4f298e7 100644 --- a/ui/gtk/packet_list.c +++ b/ui/gtk/packet_list.c @@ -177,7 +177,8 @@ col_title_change_ok (GtkWidget *w, gpointer parent_w) } if (cur_fmt == COL_CUSTOM) { - if (strcmp (name, get_column_custom_field(col_id)) != 0) { + const gchar *custom_field = get_column_custom_field(col_id); + if ((custom_field && strcmp (name, custom_field) != 0) || (custom_field == NULL)) { set_column_custom_field (col_id, name); recreate = TRUE; } |