mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-30 03:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix management of bindings during reload

Browse source 
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.
This commit is contained in:
Ryan Dwyer 2018-09-06 08:29:44 +10:00
parent 49c937fc87
commit 32c7386b0f
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/bind.c
View file

@ -329,7 +329,7 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding)
binding->command, results->error); 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_sway_binding(binding_copy);
} }
free_cmd_results(results); free_cmd_results(results);

5
sway/input/keyboard.c
View file

@ -278,12 +278,11 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
raw_modifiers, false, input_inhibited); raw_modifiers, false, input_inhibited);
if (binding_pressed) { if (binding_pressed) {
seat_execute_command(seat, binding_pressed);
handled = true;
if ((binding_pressed->flags & BINDING_RELOAD) == 0) { if ((binding_pressed->flags & BINDING_RELOAD) == 0) {
next_repeat_binding = binding_pressed; next_repeat_binding = binding_pressed;
} }
seat_execute_command(seat, binding_pressed);
handled = true;
} }
} }