isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: Make sure to clear an existing surface if we have one

Browse Source 
This fixes an assert fail when redecorating an X11 client.
This commit is contained in:
Jasper St. Pierre 2014-03-11 10:23:35 -04:00
parent 84c6b2a3fa
commit 9df8e831be
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wayland/meta-xwayland.c
View File

@ -47,6 +47,13 @@ xserver_set_window_id (struct wl_client *client,
if (!window) if (!window)
return; return;
/* If the window has an existing surface, like if we're
* undecorating or decorating the window, then we need
* to detach the window from its old surface.
*/
if (window->surface)
window->surface->window = NULL;
meta_wayland_surface_make_toplevel (surface); meta_wayland_surface_make_toplevel (surface);
surface->window = window; surface->window = window;