summaryrefslogtreecommitdiffstats
path: root/sway/input
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-09-06 10:41:49 +0200
committerLibravatar GitHub <noreply@github.com>2018-09-06 10:41:49 +0200
commitbea9f9c63fe3bd82343a2552f055162422d87d4d (patch)
tree4f1a8d0cc5353bc2eb1c39da8f5a8157bda9f53f /sway/input
parentMerge pull request #2587 from RyanDwyer/fix-layout-toggle-crash (diff)
parentFix management of bindings during reload (diff)
downloadsway-bea9f9c63fe3bd82343a2552f055162422d87d4d.tar.gz
sway-bea9f9c63fe3bd82343a2552f055162422d87d4d.tar.zst
sway-bea9f9c63fe3bd82343a2552f055162422d87d4d.zip
Merge pull request #2578 from RyanDwyer/fix-binding-reload
Fix management of bindings during reload
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) {
278 raw_modifiers, false, input_inhibited); 278 raw_modifiers, false, input_inhibited);
279 279
280 if (binding_pressed) { 280 if (binding_pressed) {
281 seat_execute_command(seat, binding_pressed);
282 handled = true;
283
284 if ((binding_pressed->flags & BINDING_RELOAD) == 0) { 281 if ((binding_pressed->flags & BINDING_RELOAD) == 0) {
285 next_repeat_binding = binding_pressed; 282 next_repeat_binding = binding_pressed;
286 } 283 }
284 seat_execute_command(seat, binding_pressed);
285 handled = true;
287 } 286 }
288 } 287 }
289 288