summaryrefslogtreecommitdiff
path: root/src/wayland
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-02-27 23:46:56 -0500
committerJasper St. Pierre <jstpierre@mecheye.net>2014-02-27 23:48:00 -0500
commit283546b3790669e7690a1a278c87627117f4b30c (patch)
treee6f602b9548fa405e8b1edce85b5147d41febe0a /src/wayland
parent98e3e5e50f9c51b7915af2adeef23af9831a6195 (diff)
downloadmutter-283546b3790669e7690a1a278c87627117f4b30c.tar.gz
wayland: Enable destroy animations for regular windows
Don't set the surface actor to a new buffer if it's becoming unmapped. This is also technically wrong since we'll send out the release event, but oh well. We should probably decouple MetaWaylandBuffer from the CoglTexture at some point, so we can send out releases on-demand.
Diffstat (limited to 'src/wayland')
-rw-r--r--src/wayland/meta-wayland-surface.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index a7bf0504e..0c5c7115f 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -262,9 +262,6 @@ ensure_buffer_texture (MetaWaylandBuffer *buffer)
CoglError *catch_error = NULL;
CoglTexture *texture;
- if (!buffer)
- return;
-
texture = COGL_TEXTURE (cogl_wayland_texture_2d_new_from_buffer (ctx,
buffer->resource,
&catch_error));
@@ -295,7 +292,7 @@ actor_surface_commit (MetaWaylandSurface *surface,
MetaSurfaceActor *surface_actor = surface->surface_actor;
MetaWaylandBuffer *buffer = pending->buffer;
- if (buffer_changed)
+ if (buffer_changed && buffer)
{
ensure_buffer_texture (buffer);
meta_surface_actor_wayland_set_buffer (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor), buffer);