shell: Fix set_transient_for with a NULL parent

11 years ago · 8f180d44f5
parent 8d344a0548
commit 8f180d44f5
1 changed files with 6 additions and 2 deletions
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@ -1855,8 +1855,12 @@ xdg_surface_set_transient_for(struct wl_client *client,
                             struct wl_resource *parent_resource)
 {
 	struct shell_surface *shsurf = wl_resource_get_user_data(resource);
-	struct weston_surface *parent =
-		wl_resource_get_user_data(parent_resource);
+	struct weston_surface *parent;
+
+	if (parent_resource)
+		parent = wl_resource_get_user_data(parent_resource);
+	else
+		parent = NULL;

 	shell_surface_set_parent(shsurf, parent);
 }