diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-03-12 21:41:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 21:41:45 -0400 |
| commit | 647c2e68ba95316cabf5ce48d72aa27f1ea4fa24 (patch) | |
| tree | 7a8be285121338b171d801462a99ca68e2c5161a | |
| parent | 7cdad5cde4c9611c0c0b4172b68d7968a3c2a143 (diff) | |
| parent | aa2b62fbff2297bf9a0adf0f600c38d1516297ff (diff) | |
| download | wlroots-647c2e68ba95316cabf5ce48d72aa27f1ea4fa24.tar.xz | |
Merge pull request #696 from emersion/fix-output-layout-destroy-global
output-layout: fix output global not destroyed
| -rw-r--r-- | types/wlr_output_layout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c index c305f04d..2462bdd2 100644 --- a/types/wlr_output_layout.c +++ b/types/wlr_output_layout.c @@ -48,6 +48,7 @@ struct wlr_output_layout *wlr_output_layout_create() { static void wlr_output_layout_output_destroy( struct wlr_output_layout_output *l_output) { wlr_signal_emit_safe(&l_output->events.destroy, l_output); + wlr_output_destroy_global(l_output->output); wl_list_remove(&l_output->state->mode.link); wl_list_remove(&l_output->state->scale.link); wl_list_remove(&l_output->state->transform.link); @@ -64,7 +65,7 @@ void wlr_output_layout_destroy(struct wlr_output_layout *layout) { wlr_signal_emit_safe(&layout->events.destroy, layout); - struct wlr_output_layout_output *l_output, *temp = NULL; + struct wlr_output_layout_output *l_output, *temp; wl_list_for_each_safe(l_output, temp, &layout->outputs, link) { wlr_output_layout_output_destroy(l_output); } @@ -291,7 +292,6 @@ void wlr_output_layout_remove(struct wlr_output_layout *layout, wlr_output_layout_output_destroy(l_output); wlr_output_layout_reconfigure(layout); } - wlr_output_destroy_global(output); } void wlr_output_layout_output_coords(struct wlr_output_layout *layout, |