Merge pull request #706 from zandrmartin/swaybg-reload

trigger bg change on config reload
This commit is contained in:
Drew DeVault 2016-06-10 08:20:25 -04:00 committed by GitHub
commit 318cef3c48

View File

@ -1692,12 +1692,16 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
swayc_t *cont = NULL; swayc_t *cont = NULL;
for (int i = 0; i < root_container.children->length; ++i) { for (int i = 0; i < root_container.children->length; ++i) {
cont = root_container.children->items[i]; cont = root_container.children->items[i];
if (cont->name && strcmp(cont->name, output->name) == 0) { if (cont->name && ((strcmp(cont->name, output->name) == 0) || (strcmp(output->name, "*") == 0))) {
apply_output_config(output, cont); apply_output_config(output, cont);
if (strcmp(output->name, "*") != 0) {
// stop looking if the output config isn't applicable to all outputs
break; break;
} }
} }
} }
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }