diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2019-05-09 16:30:08 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-05-11 13:34:48 -0400 |
| commit | 56b7d8936ad4f62d43d6ac1989b90b8b1b5a8731 (patch) | |
| tree | e103528500918007a720481873b661f9dcee5259 | |
| parent | 184663c98fe316b20818b4f2d60b1b502c2a55e8 (diff) | |
config/output: fix typo in merge_id_on_name1.1-rc2
This fixes a typo in `merge_id_on_name` for output configs that
resulted in incorrect id-on-name output configs being generated.
Instead of using the output that matched the name or identifier, the
first output in the list was being used instead. This could cause
merging across unrelated output configs and preventing output configs
from being applied correctly
| -rw-r--r-- | sway/config/output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 0022485b3..f8e78fd15 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -110,7 +110,7 @@ static void merge_id_on_name(struct output_config *oc) { wl_list_for_each(output, &root->all_outputs, link) { name = output->wlr_output->name; output_get_identifier(id, sizeof(id), output); - if (strcmp(name, oc->name) != 0 || strcmp(id, oc->name) != 0) { + if (strcmp(name, oc->name) == 0 || strcmp(id, oc->name) == 0) { size_t length = snprintf(NULL, 0, "%s on %s", id, name) + 1; id_on_name = malloc(length); if (!id_on_name) { |