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

gsk: Avoid a crash

See merge request GNOME/gtk!7408
This commit is contained in:
Matthias Clasen
2024-07-02 20:19:47 +00:00

View File

@@ -6998,7 +6998,7 @@ gsk_subsurface_node_diff (GskRenderNode *node1,
/* Shouldn't happen, can_diff() avoids this, but to be sure */
gsk_render_node_diff_impossible (node1, node2, data);
}
else if (self1->subsurface->parent != data->surface)
else if (self1->subsurface && self1->subsurface->parent != data->surface)
{
/* The inspector case */
gsk_render_node_diff (self1->child, self2->child, data);