aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-06-18 15:58:48 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-06-18 15:58:48 +1000
commit645bf446fab8db581b04babb1a34aa3c40428058 (patch)
tree4b7374d58e0b6a5b183049bc7551db8016f8a296 /sway/desktop
parent9e96cfd310c4e5dc60f07d772e60b139ff7dc448 (diff)
parent202ee511503bc7c6a18dec440ac3cdb8d5e8f859 (diff)
downloadsway-645bf446fab8db581b04babb1a34aa3c40428058.tar.xz
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 5c26ac52..37528cac 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -285,10 +285,10 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
intersects = get_view_box(&data->root_geo, data->output, data->view,
sx, sy, &box);
} else {
- if (!wlr_surface_has_buffer(surface)) {
+ texture = wlr_surface_get_texture(surface);
+ if (texture == NULL) {
return;
}
- texture = surface->texture;
intersects = get_surface_box(&data->root_geo, data->output, surface,
sx, sy, &box);
}