aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-12-06 20:20:03 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-12-11 19:19:12 +0000
commit6fa09d24e50132b65d1781ff085de8cffcc742df (patch)
tree7a5db255331b209f89e3c0f44fc270d25c5767dc
parentconfig: remove commented out struct definition (diff)
config: use “(default)” as path in log message, if path is NULL
-rw-r--r--config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.c b/config.c
index 5265a910..644147c8 100644
--- a/config.c
+++ b/config.c
@@ -2102,7 +2102,8 @@ resolve_key_binding_collisions(struct config *conf, const char *section_name,
LOG_AND_NOTIFY_ERR(
"%s:%d: [%s].%s: %s%s: "
"modifiers conflict with 'selection-override-modifiers=%s'",
- binding1->path, binding1->lineno, section_name,
+ binding1->path != NULL ? binding1->path : "(default)",
+ binding1->lineno, section_name,
action_map[binding1->action],
modifier_names, sym_name, override_names);
free(override_names);