diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-06 08:29:44 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-06 08:33:00 +1000 |
| commit | 32c7386b0f3dcd9f0138164ce597e34f79cdd1b9 (patch) | |
| tree | 0df99ee8d973003a2889f81e6e6963430cdeb13f /sway/commands | |
| parent | 49c937fc878da3ffb155429216ad8298202f1767 (diff) | |
| download | sway-32c7386b0f3dcd9f0138164ce597e34f79cdd1b9.tar.xz | |
Fix management of bindings during reload
seat_execute_command needs to check the flags on `binding_copy`, as
`binding` will be a dangling pointer after a reload command.
handle_keyboard_key needs to set the next_repeat_binding for
non-reloads prior to executing the command in case the binding is
freed by the reload command.
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/bind.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 5b56ba30..047018e0 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -329,7 +329,7 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding) binding->command, results->error); } - if (binding->flags & BINDING_RELOAD) { // free the binding if we made a copy + if (binding_copy->flags & BINDING_RELOAD) { free_sway_binding(binding_copy); } free_cmd_results(results); |