diff options
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands/bar/bindsym.c | 6 | ||||
-rw-r--r-- | sway/config/bar.c | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sway/commands/bar/bindsym.c b/sway/commands/bar/bindsym.c index b0df9eff..4eea3e6a 100644 --- a/sway/commands/bar/bindsym.c +++ b/sway/commands/bar/bindsym.c | |||
@@ -33,12 +33,12 @@ struct cmd_results *bar_cmd_bindsym(int argc, char **argv) { | |||
33 | binding->button = 0; | 33 | binding->button = 0; |
34 | if (strncasecmp(argv[0], "button", strlen("button")) == 0 && | 34 | if (strncasecmp(argv[0], "button", strlen("button")) == 0 && |
35 | strlen(argv[0]) == strlen("button0")) { | 35 | strlen(argv[0]) == strlen("button0")) { |
36 | binding->button = argv[0][strlen("button")] - '1' + 1; | 36 | binding->button = argv[0][strlen("button")] - '0'; |
37 | } | 37 | } |
38 | if (binding->button == 0) { | 38 | if (binding->button < 1 || binding->button > 9) { |
39 | free_bar_binding(binding); | 39 | free_bar_binding(binding); |
40 | return cmd_results_new(CMD_FAILURE, "bar bindsym", | 40 | return cmd_results_new(CMD_FAILURE, "bar bindsym", |
41 | "Only button<n> is supported"); | 41 | "Only button<1-9> is supported"); |
42 | } | 42 | } |
43 | 43 | ||
44 | binding->command = join_args(argv + 1, argc - 1); | 44 | binding->command = join_args(argv + 1, argc - 1); |
diff --git a/sway/config/bar.c b/sway/config/bar.c index f84407c9..c6899f57 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c | |||
@@ -32,9 +32,7 @@ void free_bar_binding(struct bar_binding *binding) { | |||
32 | if (!binding) { | 32 | if (!binding) { |
33 | return; | 33 | return; |
34 | } | 34 | } |
35 | if (binding->command) { | 35 | free(binding->command); |
36 | free(binding->command); | ||
37 | } | ||
38 | free(binding); | 36 | free(binding); |
39 | } | 37 | } |
40 | 38 | ||
@@ -49,9 +47,8 @@ void free_bar_config(struct bar_config *bar) { | |||
49 | free(bar->status_command); | 47 | free(bar->status_command); |
50 | free(bar->font); | 48 | free(bar->font); |
51 | free(bar->separator_symbol); | 49 | free(bar->separator_symbol); |
52 | while (bar->bindings->length) { | 50 | for (int i = 0; i < bar->bindings->length; i++) { |
53 | struct bar_binding *binding = bar->bindings->items[0]; | 51 | struct bar_binding *binding = bar->bindings->items[i]; |
54 | list_del(bar->bindings, 0); | ||
55 | free_bar_binding(binding); | 52 | free_bar_binding(binding); |
56 | } | 53 | } |
57 | list_free(bar->bindings); | 54 | list_free(bar->bindings); |