aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-12-11 19:00:32 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-12-11 19:19:12 +0000
commit17250ec39303755954ea8cafc5c1e93ba89e74dc (patch)
tree1fdc3ec9d98b3b8039a793045d6a36ded65c2495
parentconfig: use “(default)” as path in log message, if path is NULL (diff)
config: resolve collisions: return ‘false’ on failure
-rw-r--r--config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/config.c b/config.c
index 644147c8..8dab70e9 100644
--- a/config.c
+++ b/config.c
@@ -2089,6 +2089,7 @@ resolve_key_binding_collisions(struct config *conf, const char *section_name,
has_pipe ? " [" : "",
has_pipe ? collision_binding->pipe.argv.args[0] : "",
has_pipe ? "]" : "");
+ ret = false;
break;
}
@@ -2106,6 +2107,7 @@ resolve_key_binding_collisions(struct config *conf, const char *section_name,
binding1->lineno, section_name,
action_map[binding1->action],
modifier_names, sym_name, override_names);
+ ret = false;
free(override_names);
break;
}