aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config/output.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-03-30 00:02:29 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2018-03-30 00:04:04 -0400
commitf26ecd9f58bb672fe107660ce9b37f4bf0777a8c (patch)
tree997658454de40db3f8b76b68d658efaf2b686188 /sway/config/output.c
parentEarly return from render functions if necessary (diff)
parentMerge pull request #1654 from acrisci/refactor-2-electric-boogaloo (diff)
downloadsway-f26ecd9f58bb672fe107660ce9b37f4bf0777a8c.tar.gz
sway-f26ecd9f58bb672fe107660ce9b37f4bf0777a8c.tar.zst
sway-f26ecd9f58bb672fe107660ce9b37f4bf0777a8c.zip
Merge remote-tracking branch 'origin/wlroots' into swaybar-layers
Diffstat (limited to 'sway/config/output.c')
-rw-r--r--sway/config/output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/config/output.c b/sway/config/output.c
index c3ec61b7..b4e56efa 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
123void apply_output_config(struct output_config *oc, swayc_t *output) { 123void apply_output_config(struct output_config *oc, struct sway_container *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 destroy_output(output); 130 container_output_destroy(output);
131 return; 131 return;
132 } 132 }
133 133