Merge branch 'gtk-3-24-inkscape-1879' into 'gtk-3-24'

gtktreeview: Fix child access after TEST_EXPAND_ROW

See merge request GNOME/gtk!2609
This commit is contained in:
Matthias Clasen 2020-09-23 11:50:49 +00:00
commit c989d87c74

View File

@ -9622,13 +9622,13 @@ gtk_tree_view_build_tree (GtkTreeView *tree_view,
else
gtk_tree_path_next (path);
if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter))
if (gtk_tree_model_iter_has_child (tree_view->priv->model, iter))
{
gboolean expand;
g_signal_emit (tree_view, tree_view_signals[TEST_EXPAND_ROW], 0, iter, path, &expand);
if (gtk_tree_model_iter_has_child (tree_view->priv->model, iter)
if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter)
&& !expand)
{
temp->children = _gtk_rbtree_new ();