diff options
author | 2018-06-07 19:26:55 +0100 | |
---|---|---|
committer | 2018-06-07 19:26:55 +0100 | |
commit | 2e289831ee3198f36e2c02bd4542fa4f6646a81b (patch) | |
tree | 7de104885aabb49f17739d7631ef6cd4f628e64a /sway/config | |
parent | Merge pull request #2116 from RedSoxFan/fix-2113 (diff) | |
parent | Switch output storing from list_t to wl_list (diff) | |
download | sway-2e289831ee3198f36e2c02bd4542fa4f6646a81b.tar.gz sway-2e289831ee3198f36e2c02bd4542fa4f6646a81b.tar.zst sway-2e289831ee3198f36e2c02bd4542fa4f6646a81b.zip |
Merge pull request #2108 from RedSoxFan/store-outputs
Allow outputs to be re-enabled
Diffstat (limited to 'sway/config')
-rw-r--r-- | sway/config/output.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index ee2440ea..648ded27 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
@@ -131,11 +131,13 @@ void apply_output_config(struct output_config *oc, struct sway_container *output | |||
131 | struct wlr_output *wlr_output = output->sway_output->wlr_output; | 131 | struct wlr_output *wlr_output = output->sway_output->wlr_output; |
132 | 132 | ||
133 | if (oc && oc->enabled == 0) { | 133 | if (oc && oc->enabled == 0) { |
134 | struct sway_output *sway_output = output->sway_output; | ||
134 | if (output->sway_output->bg_pid != 0) { | 135 | if (output->sway_output->bg_pid != 0) { |
135 | terminate_swaybg(output->sway_output->bg_pid); | 136 | terminate_swaybg(output->sway_output->bg_pid); |
136 | output->sway_output->bg_pid = 0; | 137 | output->sway_output->bg_pid = 0; |
137 | } | 138 | } |
138 | container_destroy(output); | 139 | container_destroy(output); |
140 | sway_output->swayc = NULL; | ||
139 | wlr_output_layout_remove(root_container.sway_root->output_layout, | 141 | wlr_output_layout_remove(root_container.sway_root->output_layout, |
140 | wlr_output); | 142 | wlr_output); |
141 | return; | 143 | return; |