Merge remote-tracking branch 'upstream/main' into wlroots-next

1 files changed, 3 insertions, 1 deletions

diff --git a/client.h b/client.h
index 64d097f..3c81135 100644
--- a/client.h
+++ b/client.h
@@ -315,7 +315,9 @@ toplevel_from_popup(struct wlr_xdg_popup *popup)
 	while (1) {
 		switch (surface->role) {
 		case WLR_XDG_SURFACE_ROLE_POPUP:
-			if (wlr_surface_is_layer_surface(surface->popup->parent))
+			if (!surface->popup->parent)
+				return NULL;
+			else if (wlr_surface_is_layer_surface(surface->popup->parent))
 				return wlr_layer_surface_v1_from_wlr_surface(surface->popup->parent)->data;
 			else if (!wlr_surface_is_xdg_surface(surface->popup->parent))
 				return NULL;