aboutsummaryrefslogtreecommitdiff
path: root/sway/config
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-05-01 13:41:37 -0400
committerGitHub <noreply@github.com>2018-05-01 13:41:37 -0400
commitc82a04e110b55c37a24fb5175e35ab8e5bec534c (patch)
tree926b0553f47eb786dc0c40ab99d2d56ebc64c66b /sway/config
parent0e51c7be449dd68025d5acd8c634f8dcacb10a16 (diff)
parent22170bde77a92126ab5c183604634bbb2b89a10a (diff)
downloadsway-c82a04e110b55c37a24fb5175e35ab8e5bec534c.tar.xz
Merge pull request #1885 from thejan2009/master
Fix layer surface segfault on output destroy
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/output.c4
1 files changed, 4 insertions, 0 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);