From befa65318a06a35d8014879577c0a34060aa30e2 Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Mon, 11 Jun 2012 14:59:31 -0600 Subject: [PATCH] compositor: Update grab variable in notify_key() after binding handler. We need to update the temp grab pointer after weston_compositor_run_key_binding() before calling the key handler because it may have installed a new grab. --- src/compositor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/compositor.c b/src/compositor.c index 26c9a95..09de2f6 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1839,9 +1839,11 @@ notify_key(struct wl_seat *seat, uint32_t time, uint32_t key, *k = key; } - if (grab == &seat->keyboard->default_grab) + if (grab == &seat->keyboard->default_grab) { weston_compositor_run_key_binding(compositor, ws, time, key, state); + grab = seat->keyboard->grab; + } grab->interface->key(grab, time, key, state); if (mods) -- 2.7.4