aboutsummaryrefslogtreecommitdiff
path: root/sway/input
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-09-06 08:29:44 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-09-06 08:33:00 +1000
commit32c7386b0f3dcd9f0138164ce597e34f79cdd1b9 (patch)
tree0df99ee8d973003a2889f81e6e6963430cdeb13f /sway/input
parent49c937fc878da3ffb155429216ad8298202f1767 (diff)
downloadsway-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/input')
-rw-r--r--sway/input/keyboard.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 0d2a62b5..a74229f5 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -278,12 +278,11 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
raw_modifiers, false, input_inhibited);
if (binding_pressed) {
- seat_execute_command(seat, binding_pressed);
- handled = true;
-
if ((binding_pressed->flags & BINDING_RELOAD) == 0) {
next_repeat_binding = binding_pressed;
}
+ seat_execute_command(seat, binding_pressed);
+ handled = true;
}
}