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

Fix management of bindings during reload

2 files changed, 3 insertions, 4 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);
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;
                 }
         }