Merge branch 'fix-warning-combobox-destroy' into 'gtk-3-24'

Fix warning on GtkComboBox destroy See merge request GNOME/gtk!311
2018-08-28 19:27:24 +00:00
parent ea2bef06ec aa5d926c84
commit 2307f8ec67
1 changed files with 3 additions and 0 deletions
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@ -2429,6 +2429,9 @@ gtk_combo_box_popdown (GtkComboBox *combo_box)
  if (!gtk_widget_get_realized (GTK_WIDGET (combo_box)))
    return;

+  if (!priv->popup_window)
+    return;
+
  if (!gtk_widget_is_drawable (priv->popup_window))
    return;