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

config/output: fix typo in merge_id_on_name

Browse source 
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
This commit is contained in:
Brian Ashworth 2019-05-09 16:30:08 -04:00 committed by Simon Ser
parent 9dca18b6f7
commit 8c8e6a6c90
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/config/output.c
View file

@ -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) {