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
master
Brian Ashworth 6 years ago committed by Simon Ser
parent 9dca18b6f7
commit 8c8e6a6c90

@ -110,7 +110,7 @@ static void merge_id_on_name(struct output_config *oc) {
wl_list_for_each(output, &root->all_outputs, link) { wl_list_for_each(output, &root->all_outputs, link) {
name = output->wlr_output->name; name = output->wlr_output->name;
output_get_identifier(id, sizeof(id), output); 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; size_t length = snprintf(NULL, 0, "%s on %s", id, name) + 1;
id_on_name = malloc(length); id_on_name = malloc(length);
if (!id_on_name) { if (!id_on_name) {

Loading…
Cancel
Save