diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-06-05 17:56:32 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-06-06 20:11:24 -0400 |
commit | a1b5b93d299bfe129f2b3409a7f642049fcce1d6 (patch) | |
tree | 4d87f5ab8f0f18ada1fc12a4eb4ba3b5d0350527 /sway/tree | |
parent | 22c1c4beb4baa369f883fb5360c40158513c8e10 (diff) | |
download | sway-a1b5b93d299bfe129f2b3409a7f642049fcce1d6.tar.xz |
Store sway_outputs so that they can be reenabled
Diffstat (limited to 'sway/tree')
-rw-r--r-- | sway/tree/container.c | 2 | ||||
-rw-r--r-- | sway/tree/layout.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index d0d26631..af965857 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -255,7 +255,6 @@ static struct sway_container *container_output_destroy( } } - wl_list_remove(&output->sway_output->destroy.link); wl_list_remove(&output->sway_output->mode.link); wl_list_remove(&output->sway_output->transform.link); wl_list_remove(&output->sway_output->scale.link); @@ -265,6 +264,7 @@ static struct sway_container *container_output_destroy( // clear the wlr_output reference to this container output->sway_output->wlr_output->data = NULL; + output->sway_output->swayc = NULL; wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name); _container_destroy(output); diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 82502e1b..ce53a515 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -35,6 +35,7 @@ void layout_init(void) { root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); root_container.sway_root->output_layout = wlr_output_layout_create(); + root_container.sway_root->outputs = create_list(); wl_list_init(&root_container.sway_root->xwayland_unmanaged); wl_signal_init(&root_container.sway_root->events.new_container); |