From 32c7386b0f3dcd9f0138164ce597e34f79cdd1b9 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 6 Sep 2018 08:29:44 +1000
Subject: [PATCH] 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.
---
sway/commands/bind.c | 2 +-
sway/input/keyboard.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index 5b56ba309..047018e0e 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 0d2a62b52..a74229f5a 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;
}
}