AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-29 15:01:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-main' into 'main'

Browse Source 
Matthiasc/for main

See merge request GNOME/gtk!6091
This commit is contained in:
Matthias Clasen 2023-06-12 19:18:49 +00:00
commit e5f570045e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -403,8 +403,9 @@ asan-build:
- .gitlab-ci/run-tests.sh _build wayland_gles - .gitlab-ci/run-tests.sh _build wayland_gles
- .gitlab-ci/run-tests.sh _build x11 - .gitlab-ci/run-tests.sh _build x11
artifacts: artifacts:
when: always
paths: paths:
- _build/meson-logs - "${CI_PROJECT_DIR}/_build/meson-logs"
reference: reference:
image: $FEDORA_IMAGE image: $FEDORA_IMAGE

2
gtk/gtklistitemmanager.c
View File

@ -1137,7 +1137,7 @@ gtk_list_item_manager_release_items (GtkListItemManager *self,
if (i == 0) if (i == 0)
{ {
header = gtk_list_tile_get_previous_skip (tile); header = gtk_list_tile_get_previous_skip (tile);
if (!gtk_list_tile_is_header (header)) if (header && !gtk_list_tile_is_header (header))
header = NULL; header = NULL;
} }
else else