Merge pull request #4084 from orestisfl/get_output_by_name_primary_active

get_output_by_name: guard output->primary with require_active
This commit is contained in:
Ingo Bürk 2020-05-15 10:02:58 +02:00 committed by GitHub
commit 08052ddeb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -51,12 +51,12 @@ Output *get_output_by_name(const char *name, const bool require_active) {
Output *output;
bool get_primary = (strcasecmp("primary", name) == 0);
TAILQ_FOREACH (output, &outputs, outputs) {
if (output->primary && get_primary) {
return output;
}
if (require_active && !output->active) {
continue;
}
if (output->primary && get_primary) {
return output;
}
struct output_name *output_name;
SLIST_FOREACH (output_name, &output->names_head, names) {
if (strcasecmp(output_name->name, name) == 0) {