diff options
Diffstat (limited to 'desktop-shell/shell.c')
-rw-r--r-- | desktop-shell/shell.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 1242f93c..076b4549 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3717,14 +3717,14 @@ xdg_surface_set_parent(struct wl_client *client, struct wl_resource *parent_resource) { struct shell_surface *shsurf = wl_resource_get_user_data(resource); - struct weston_surface *parent; + struct shell_surface *parent; - if (parent_resource) + if (parent_resource) { parent = wl_resource_get_user_data(parent_resource); - else - parent = NULL; - - shell_surface_set_parent(shsurf, parent); + shell_surface_set_parent(shsurf, parent->surface); + } else { + shell_surface_set_parent(shsurf, NULL); + } } static void |