Merge pull request #294 from christophgysin/match

Fix using last output config if none matched
This commit is contained in:
Drew DeVault 2015-12-02 16:08:26 -05:00
commit 2b41d26b63

View file

@ -82,13 +82,15 @@ swayc_t *new_output(wlc_handle handle) {
struct output_config *oc = NULL; struct output_config *oc = NULL;
int i; int i;
for (i = 0; i < config->output_configs->length; ++i) { for (i = 0; i < config->output_configs->length; ++i) {
oc = config->output_configs->items[i]; struct output_config *cur = config->output_configs->items[i];
if (strcasecmp(name, oc->name) == 0) { if (strcasecmp(name, cur->name) == 0) {
sway_log(L_DEBUG, "Matched output config for %s", name); sway_log(L_DEBUG, "Matched output config for %s", name);
oc = cur;
break; break;
} }
if (strcasecmp("*", oc->name) == 0) { if (strcasecmp("*", cur->name) == 0) {
sway_log(L_DEBUG, "Matched wildcard output config for %s", name); sway_log(L_DEBUG, "Matched wildcard output config for %s", name);
oc = cur;
break; break;
} }
} }