diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-24 20:34:47 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-24 20:34:47 +0000 |
| commit | fa57f20b874f3642c83ea358c7e8c44c57062e0c (patch) | |
| tree | 95d0e14541b46f686420283e992ff5c7c1d71658 | |
| parent | 5531906973dff9e0f0f9004545ed0794a65866ac (diff) | |
| parent | e211740da6ced87ec59a7231be2e3fba64d2dfb2 (diff) | |
| download | gtk+-fa57f20b874f3642c83ea358c7e8c44c57062e0c.tar.gz | |
Merge branch 'wip/fix-stack-get-item' into 'master'
stack: Fix some list model issues
See merge request GNOME/gtk!3345
| -rw-r--r-- | gtk/gtkstack.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index 41aa4958b5..e784b0c30f 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -538,6 +538,9 @@ gtk_stack_pages_get_item (GListModel *model, page = g_list_nth_data (priv->children, position); + if (!page) + return NULL; + return g_object_ref (page); } @@ -559,7 +562,7 @@ gtk_stack_pages_is_selected (GtkSelectionModel *model, page = g_list_nth_data (priv->children, position); - return page == priv->visible_child; + return page && page == priv->visible_child; } static void set_visible_child (GtkStack *stack, |