alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't add disabled outputs back to output layout

Browse source 
Return early from apply_output_config if the output is disabled.
This restores our previous behavior [1].

[1]: 0cdcf66bbc (diff-4f65f4327e987fef8ec3796cdb07644eL349)
This commit is contained in:
Simon Ser 2020-04-09 10:18:40 +02:00 committed by Drew DeVault
parent 97a6524a5a
commit 34dccd4224
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/config/output.c
View file

@ -425,6 +425,10 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
return false; return false;
} }
if (oc && !oc->enabled) {
return true;
}
if (config->reloading) { if (config->reloading) {
output_damage_whole(output); output_damage_whole(output);
} }
@ -464,7 +468,7 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
output->width = output_box->width; output->width = output_box->width;
output->height = output_box->height; output->height = output_box->height;
if ((!oc || oc->enabled) && !output->configured) { if (!output->configured) {
output_configure(output); output_configure(output);
} }