diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-09-09 16:59:09 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-09-09 16:59:09 +0000 |
| commit | 0ff962a182f51d47c3c539444dcf79c7af8592a0 (patch) | |
| tree | 80b9729373c2e8bd3c3928371d3136a24994f6f8 | |
| parent | changelog: move deprecation section up first, change most ‘footrc’ -> ‘foot.ini’ (diff) | |
| parent | config: 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.c | 2 | ||||
| -rw-r--r-- | wayland.h | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -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; } @@ -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 { |
