From 94ae322f65dc01ac545652baf2bdef93345af7b2 Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Thu, 19 Jan 2017 03:26:09 +0000 Subject: [PATCH] combobox: Avoid a pointless assignment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don’t get the active item pointer before the grid/non-grid conditional, because if we’re in grid mode, we re-get it before selecting it anyway. --- gtk/gtkcombobox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 72e94a198a..3fb8222d35 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1734,8 +1734,6 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box, g_object_set (priv->popup_widget, "menu-type-hint", GDK_WINDOW_TYPE_HINT_COMBO, NULL); - active = gtk_menu_get_active (GTK_MENU (priv->popup_widget)); - if (priv->wrap_width > 0 || priv->cell_view == NULL) { gtk_css_gadget_get_border_allocation (priv->gadget, &border_allocation, NULL); @@ -1761,6 +1759,8 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box, GList *i; GtkWidget *child; + active = gtk_menu_get_active (GTK_MENU (priv->popup_widget)); + if (!(active && gtk_widget_get_visible (active))) { for (i = GTK_MENU_SHELL (priv->popup_widget)->priv->children; i && !active; i = i->next)