From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 May 2007 15:26:01 +0000 (+0000)
Subject: merge r6285 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~115
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3c387c65d4dc2d9083eaacbbc23ccfb7f3851259;p=dana%2Fopenbox.git

merge r6285 from trunk
---

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index d8f35bcc..84ae2a38 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -195,14 +195,15 @@ static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
 
     g_assert(istate.active);
 
+    /* ungrab first so they won't be NotifyWhileGrabbed */
+    if (ungrab)
+        grab_keyboard(FALSE);
+
     alist = g_slist_append(NULL, istate.action);
     action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
     g_slist_free(alist);
 
     istate.active = FALSE;
-
-    if (ungrab)
-        grab_keyboard(FALSE);
 }
 
 static void keyboard_interactive_end_client(ObClient *client, gpointer data)