From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 11 Jun 2012 20:59:31 +0000 (-0600)
Subject: compositor: Update grab variable in notify_key() after binding handler.
X-Git-Tag: 0.94.90~103
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=befa65318a06a35d8014879577c0a34060aa30e2;p=profile%2Fivi%2Fweston.git

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.
---

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)