From a0bbe67076b8e32b47a272bc1e96be853006c65d Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 6 Jun 2018 17:12:02 -0400 Subject: Address emersions comments on output re-enabling --- sway/desktop/layer_shell.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/desktop/layer_shell.c') diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 2d355b74..3accdefb 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -252,7 +252,7 @@ static void unmap(struct sway_layer_surface *sway_layer) { return; } struct sway_output *output = wlr_output->data; - if (output == NULL) { + if (output == NULL || output->swayc == NULL) { return; } output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, @@ -279,7 +279,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&sway_layer->surface_commit.link); if (sway_layer->layer_surface->output != NULL) { struct sway_output *output = sway_layer->layer_surface->output->data; - if (output != NULL) { + if (output != NULL && output->swayc != NULL) { arrange_layers(output); } wl_list_remove(&sway_layer->output_destroy.link); -- cgit v1.2.3-54-g00ecf