diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-06-03 20:07:12 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-04 01:50:47 +0000 |
| commit | 9f010267861115678cb088fe5a5084ad93e5ed1c (patch) | |
| tree | cbbb452459d0c51eaa6389907d336aa8c8088ba0 /ui | |
| parent | 20ec1a798bbf9da9a56fe059ed4993da72f3b741 (diff) | |
| download | wireshark-9f010267861115678cb088fe5a5084ad93e5ed1c.tar.gz | |
Bugfix GTK Decode As
Current layer number needs to be unconditionally saved after v2.3.0rc0-3740-ge1f84f985e,
which increased the number of dissectors that use current layer number to
determine Decode As value.
Change-Id: Ib82370af94ea00613a337890369e228cffa1ed81
Reviewed-on: https://code.wireshark.org/review/21928
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 0c166f947e9c0f92f3c9bd56fe3db59589511b60)
Reviewed-on: https://code.wireshark.org/review/21929
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/decode_as_dlg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index f4d3af4db7..4e8292b439 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -1265,11 +1265,11 @@ decode_add_simple_page (decode_as_t *entry) g_object_set_data(G_OBJECT(page), E_PAGE_ACTION, decode_simple); g_object_set_data(G_OBJECT(page), E_PAGE_TABLE, (gchar *) entry->table_name); g_object_set_data(G_OBJECT(page), E_PAGE_DECODE_AS_DATA, (gchar *)entry); + g_object_set_data(G_OBJECT(page), E_PAGE_CURR_LAYER_NUM, GUINT_TO_POINTER((guint)cfile.edt->pi.curr_layer_num)); if (entry->num_items == 1) { g_object_set_data(G_OBJECT(page), E_PAGE_VALUE, entry->values[0].build_values[0](&cfile.edt->pi)); - g_object_set_data(G_OBJECT(page), E_PAGE_CURR_LAYER_NUM, GUINT_TO_POINTER((guint)cfile.edt->pi.curr_layer_num)); /* Always enabled */ entry->values->label_func(&cfile.edt->pi, prompt); |