diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-05-01 13:41:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 13:41:37 -0400 |
| commit | c82a04e110b55c37a24fb5175e35ab8e5bec534c (patch) | |
| tree | 926b0553f47eb786dc0c40ab99d2d56ebc64c66b /sway | |
| parent | 0e51c7be449dd68025d5acd8c634f8dcacb10a16 (diff) | |
| parent | 22170bde77a92126ab5c183604634bbb2b89a10a (diff) | |
Merge pull request #1885 from thejan2009/master
Fix layer surface segfault on output destroy
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/config/output.c | 4 | ||||
| -rw-r--r-- | sway/desktop/layer_shell.c | 9 | ||||
| -rw-r--r-- | sway/tree/container.c | 3 |
3 files changed, 14 insertions, 2 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 1c298d37..68022278 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -128,6 +128,10 @@ void apply_output_config(struct output_config *oc, struct sway_container *output struct wlr_output *wlr_output = output->sway_output->wlr_output; if (oc && oc->enabled == 0) { + if (output->sway_output->bg_pid != 0) { + terminate_swaybg(output->sway_output->bg_pid); + output->sway_output->bg_pid = 0; + } container_destroy(output); wlr_output_layout_remove(root_container.sway_root->output_layout, wlr_output); diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 03419ac1..c904880d 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -255,6 +255,9 @@ static void unmap(struct sway_layer_surface *sway_layer) { return; } struct sway_output *output = wlr_output->data; + if (output == NULL) { + return; + } output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, sway_layer->layer_surface->surface, true); } @@ -274,9 +277,11 @@ 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; - arrange_layers(output); - + if (output != NULL) { + arrange_layers(output); + } wl_list_remove(&sway_layer->output_destroy.link); + sway_layer->layer_surface->output = NULL; } free(sway_layer); } diff --git a/sway/tree/container.c b/sway/tree/container.c index 995da5ce..6ac59547 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -156,6 +156,9 @@ static struct sway_container *container_output_destroy( wl_list_remove(&output->sway_output->damage_destroy.link); wl_list_remove(&output->sway_output->damage_frame.link); + // clear the wlr_output reference to this container + output->sway_output->wlr_output->data = NULL; + wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name); _container_destroy(output); return &root_container; |