diff options
| author |  Brian Ashworth <bosrsf04@gmail.com> | 2018-06-06 17:12:02 -0400 |
|---|---|---|
| committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-06-06 20:11:24 -0400 |
| commit | a0bbe67076b8e32b47a272bc1e96be853006c65d (patch) | |
| tree | 3faf1af6058947968b958d2bdabdbc47ea3bfa06 /sway/desktop/layer_shell.c | |
| parent | Store sway_outputs so that they can be reenabled (diff) | |
| download | sway-a0bbe67076b8e32b47a272bc1e96be853006c65d.tar.gz sway-a0bbe67076b8e32b47a272bc1e96be853006c65d.tar.zst sway-a0bbe67076b8e32b47a272bc1e96be853006c65d.zip | |
Address emersions comments on output re-enabling
Diffstat (limited to 'sway/desktop/layer_shell.c')
| -rw-r--r-- | sway/desktop/layer_shell.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { | |||
| 252 | return; | 252 | return; |
| 253 | } | 253 | } |
| 254 | struct sway_output *output = wlr_output->data; | 254 | struct sway_output *output = wlr_output->data; |
| 255 | if (output == NULL) { | 255 | if (output == NULL || output->swayc == NULL) { |
| 256 | return; | 256 | return; |
| 257 | } | 257 | } |
| 258 | output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, | 258 | 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) { | |||
| 279 | wl_list_remove(&sway_layer->surface_commit.link); | 279 | wl_list_remove(&sway_layer->surface_commit.link); |
| 280 | if (sway_layer->layer_surface->output != NULL) { | 280 | if (sway_layer->layer_surface->output != NULL) { |
| 281 | struct sway_output *output = sway_layer->layer_surface->output->data; | 281 | struct sway_output *output = sway_layer->layer_surface->output->data; |
| 282 | if (output != NULL) { | 282 | if (output != NULL && output->swayc != NULL) { |
| 283 | arrange_layers(output); | 283 | arrange_layers(output); |
| 284 | } | 284 | } |
| 285 | wl_list_remove(&sway_layer->output_destroy.link); | 285 | wl_list_remove(&sway_layer->output_destroy.link); |