diff options
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/container.c | 4 | ||||
| -rw-r--r-- | sway/tree/layout.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index d0d26631..ca993c41 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); @@ -263,8 +262,7 @@ 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; + 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..b54dc2fe 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(); + wl_list_init(&root_container.sway_root->outputs); wl_list_init(&root_container.sway_root->xwayland_unmanaged); wl_signal_init(&root_container.sway_root->events.new_container); |