aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-09-09 16:59:09 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-09-09 16:59:09 +0000
commit0ff962a182f51d47c3c539444dcf79c7af8592a0 (patch)
tree80b9729373c2e8bd3c3928371d3136a24994f6f8
parentchangelog: move deprecation section up first, change most ‘footrc’ -> ‘foot.ini’ (diff)
parentconfig: key binding: free pipe cmd/argv when action is invalid (diff)
Merge branch 'fix-pipe-selected-not-being-recognized-as-a-valid-action' into master
Closes #125
-rw-r--r--config.c2
-rw-r--r--wayland.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/config.c b/config.c
index f15be1c2..7b71df95 100644
--- a/config.c
+++ b/config.c
@@ -1107,6 +1107,8 @@ parse_section_key_bindings(
LOG_AND_NOTIFY_ERR("%s:%u: [key-bindings]: %s: invalid action",
path, lineno, key);
+ free(pipe_cmd);
+ free(pipe_argv);
return false;
}
diff --git a/wayland.h b/wayland.h
index 7757c970..e12d816a 100644
--- a/wayland.h
+++ b/wayland.h
@@ -43,8 +43,6 @@ enum bind_action_normal {
BIND_ACTION_PIPE_VIEW,
BIND_ACTION_PIPE_SELECTED,
- BIND_ACTION_KEY_COUNT = BIND_ACTION_PIPE_SELECTED,
-
/* Mouse specific actions - i.e. they require a mouse coordinate */
BIND_ACTION_SELECT_BEGIN,
BIND_ACTION_SELECT_BEGIN_BLOCK,
@@ -53,7 +51,8 @@ enum bind_action_normal {
BIND_ACTION_SELECT_WORD_WS,
BIND_ACTION_SELECT_ROW,
- BIND_ACTION_COUNT,
+ BIND_ACTION_KEY_COUNT = BIND_ACTION_PIPE_SELECTED + 1,
+ BIND_ACTION_COUNT = BIND_ACTION_SELECT_ROW + 1,
};
struct key_binding_normal {