sway

commit bea9f9c63fe3bd82343a2552f055162422d87d4d
parent 63567f5ac6f48ce722889dd9887e5f9f1ae62cc7
Author: emersion <contact@emersion.fr>
Date:   Thu,  6 Sep 2018 10:41:49 +0200

Merge pull request #2578 from RyanDwyer/fix-binding-reload

Fix management of bindings during reload
Diffstat:
M
sway/commands/bind.c
 | 
2
+-
M
sway/input/keyboard.c
 | 
5
++---

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git 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);
diff --git 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;
 		}
 	}