From 8c8e6a6c9089d70c3b970b03c3f783eafd16f825 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Thu, 9 May 2019 16:30:08 -0400 Subject: config/output: fix typo in merge_id_on_name 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 --- sway/config/output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/config/output.c b/sway/config/output.c index 0022485b..f8e78fd1 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) { -- cgit v1.2.3-54-g00ecf