diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-03-30 00:00:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-30 00:00:23 -0400 |
| commit | 7162b9bea4d66d61376ad3605e23e2d83bb95201 (patch) | |
| tree | 6f7a3121f15503a923c1ce53bf2bee368c6149a6 /sway/config/output.c | |
| parent | 472e81f35d689d67cda241acafda91c688d61046 (diff) | |
| parent | 8f490d7d2dbadfe85dcf3dcd972471e86671442a (diff) | |
Merge pull request #1654 from acrisci/refactor-2-electric-boogaloo
Revert "Merge pull request #1653 from swaywm/revert-1647-refactor-tree"
Diffstat (limited to 'sway/config/output.c')
| -rw-r--r-- | sway/config/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 9e211861..7fc79739 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -120,14 +120,14 @@ void terminate_swaybg(pid_t pid) { } } -void apply_output_config(struct output_config *oc, swayc_t *output) { +void apply_output_config(struct output_config *oc, struct sway_container *output) { assert(output->type == C_OUTPUT); struct wlr_output *wlr_output = output->sway_output->wlr_output; if (oc && oc->enabled == 0) { wlr_output_layout_remove(root_container.sway_root->output_layout, wlr_output); - destroy_output(output); + container_output_destroy(output); return; } |