Merge branch 'master' of https://github.com/swaywm/sway

udfn · Aug 23, 2023 · 06a3235 · 06a3235
2 parents 8485911 + a908651
commit 06a3235
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
@@ -35,13 +35,13 @@ struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface(
 		}
 
 		// Layer surface popup
-		struct wlr_xdg_surface * xdg_popup = NULL;
-		if ((xdg_popup = wlr_xdg_surface_try_from_wlr_surface(surface)) &&
-				xdg_popup->role == WLR_XDG_SURFACE_ROLE_POPUP) {
-			if (!xdg_popup->popup->parent) {
+		struct wlr_xdg_surface *xdg_surface = NULL;
+		if ((xdg_surface = wlr_xdg_surface_try_from_wlr_surface(surface)) &&
+				xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP && xdg_surface->popup != NULL) {
+			if (!xdg_surface->popup->parent) {
 				return NULL;
 			}
-			surface = wlr_surface_get_root_surface(xdg_popup->popup->parent);
+			surface = wlr_surface_get_root_surface(xdg_surface->popup->parent);
 			continue;
 		}
 

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
@@ -62,7 +62,8 @@ static struct wlr_surface *layer_surface_at(struct sway_output *output,
 static bool surface_is_xdg_popup(struct wlr_surface *surface) {
 	struct wlr_surface *root = wlr_surface_get_root_surface(surface);
 	struct wlr_xdg_surface *xdg_surface = wlr_xdg_surface_try_from_wlr_surface(root);
-	return xdg_surface != NULL && xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP;
+	return xdg_surface != NULL && xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP &&
+		xdg_surface->popup != NULL;
 }
 
 static struct wlr_surface *layer_surface_popup_at(struct sway_output *output,

diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -417,7 +417,7 @@ bool surface_is_popup(struct wlr_surface *surface) {
 	}
 	struct wlr_xdg_surface *xdg_surface =
 		wlr_xdg_surface_try_from_wlr_surface(surface);
-	return xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP;
+	return xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP && xdg_surface->popup != NULL;
 }
 
 struct sway_container *container_at(struct sway_workspace *workspace,