diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-03-29 23:29:29 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-29 23:29:29 -0400 |
| commit | d0c7f66e950689b70196a890b62b82ff3c66e103 (patch) | |
| tree | b8b52173a9791e3b13a0316ab9d316a80a6adc20 /sway/config | |
| parent | Merge pull request #1647 from acrisci/refactor-tree (diff) | |
| download | sway-d0c7f66e950689b70196a890b62b82ff3c66e103.tar.gz sway-d0c7f66e950689b70196a890b62b82ff3c66e103.tar.zst sway-d0c7f66e950689b70196a890b62b82ff3c66e103.zip | |
Revert "Refactor tree"
Diffstat (limited to 'sway/config')
| -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 7fc79739..9e211861 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
| @@ -120,14 +120,14 @@ void terminate_swaybg(pid_t pid) { | |||
| 120 | } | 120 | } |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | void apply_output_config(struct output_config *oc, struct sway_container *output) { | 123 | void apply_output_config(struct output_config *oc, swayc_t *output) { |
| 124 | assert(output->type == C_OUTPUT); | 124 | assert(output->type == C_OUTPUT); |
| 125 | 125 | ||
| 126 | struct wlr_output *wlr_output = output->sway_output->wlr_output; | 126 | struct wlr_output *wlr_output = output->sway_output->wlr_output; |
| 127 | if (oc && oc->enabled == 0) { | 127 | if (oc && oc->enabled == 0) { |
| 128 | wlr_output_layout_remove(root_container.sway_root->output_layout, | 128 | wlr_output_layout_remove(root_container.sway_root->output_layout, |
| 129 | wlr_output); | 129 | wlr_output); |
| 130 | container_output_destroy(output); | 130 | destroy_output(output); |
| 131 | return; | 131 | return; |
| 132 | } | 132 | } |
| 133 | 133 | ||