callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Ensure we destroy the shell surface when destroying the surface

Browse Source 
Otherwise we can try and use an invalid object that the compositor has already
deleted.
This commit is contained in:
Rob Bradford
2012-07-11 19:22:27 +01:00
parent 8bd1478596
commit 91a11ee277
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gdk/wayland/gdkwindow-wayland.c
View File

@ -764,7 +764,11 @@ gdk_wayland_window_hide (GdkWindow *window)
if (impl->surface) if (impl->surface)
{ {
wl_surface_destroy(impl->surface); if (impl->shell_surface)
wl_shell_surface_destroy(impl->shell_surface);
if (impl->surface)
wl_surface_destroy(impl->surface);
impl->shell_surface = NULL;
impl->surface = NULL; impl->surface = NULL;
cairo_surface_destroy(impl->server_surface); cairo_surface_destroy(impl->server_surface);
impl->server_surface = NULL; impl->server_surface = NULL;
@ -788,13 +792,17 @@ gdk_window_wayland_withdraw (GdkWindow *window)
impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
if (impl->surface) if (impl->surface)
{ {
wl_surface_destroy(impl->surface); if (impl->shell_surface)
impl->surface = NULL; wl_shell_surface_destroy(impl->shell_surface);
cairo_surface_destroy(impl->server_surface); if (impl->surface)
impl->server_surface = NULL; wl_surface_destroy(impl->surface);
impl->mapped = FALSE; impl->shell_surface = NULL;
} impl->surface = NULL;
cairo_surface_destroy(impl->server_surface);
impl->server_surface = NULL;
impl->mapped = FALSE;
}
} }
} }
@ -1034,9 +1042,12 @@ gdk_wayland_window_destroy (GdkWindow *window,
if (!recursing && !foreign_destroy) if (!recursing && !foreign_destroy)
{ {
if (GDK_WINDOW_IMPL_WAYLAND (window->impl)->surface) if (impl->shell_surface)
wl_surface_destroy(GDK_WINDOW_IMPL_WAYLAND (window->impl)->surface); wl_shell_surface_destroy(impl->shell_surface);
wl_shell_surface_destroy(GDK_WINDOW_IMPL_WAYLAND (window->impl)->shell_surface); if (impl->surface)
wl_surface_destroy(impl->surface);
impl->shell_surface = NULL;
impl->surface = NULL;
} }
} }