xdg-toplevel: treat unmapped parents as NULL

This commit is contained in:
Kirill Primak 2022-03-04 00:59:22 +03:00 committed by Simon Ser
parent 2e14bed9f7
commit bf3f60ff73

View file

@ -151,11 +151,13 @@ void wlr_xdg_toplevel_set_parent(struct wlr_xdg_toplevel *toplevel,
wl_list_remove(&toplevel->parent_unmap.link); wl_list_remove(&toplevel->parent_unmap.link);
} }
toplevel->parent = parent; if (parent && parent->base->mapped) {
if (parent) { toplevel->parent = parent;
toplevel->parent_unmap.notify = handle_parent_unmap; toplevel->parent_unmap.notify = handle_parent_unmap;
wl_signal_add(&toplevel->parent->base->events.unmap, wl_signal_add(&toplevel->parent->base->events.unmap,
&toplevel->parent_unmap); &toplevel->parent_unmap);
} else {
toplevel->parent = NULL;
} }
wlr_signal_emit_safe(&toplevel->events.set_parent, NULL); wlr_signal_emit_safe(&toplevel->events.set_parent, NULL);