diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-23 11:50:49 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-23 11:50:49 +0000 |
| commit | c989d87c74ee6f166fac3cfc9a55f840d44ad327 (patch) | |
| tree | d01a9e179a3f6a6bd33a147eabda6c7d35b967f4 | |
| parent | 954af8f0bb5d9915f5ee24f2c40f2bacc964bf93 (diff) | |
| parent | e35378ba3712b6d01b8cd34a732d49ca2e269350 (diff) | |
| download | gtk+-c989d87c74ee6f166fac3cfc9a55f840d44ad327.tar.gz | |
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
| -rw-r--r-- | gtk/gtktreeview.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 20f09ef48d..704702cb97 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -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 (); |