From: Mikael Magnusson <mikachu@gmail.com>
Date: Mon, 18 Jan 2010 15:48:27 +0000 (+0100)
Subject: Don't close the menu when you held control even for execute
X-Git-Tag: xkb~14
X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=7cfaae8da9271a7bad4c73886c894a14cbf456e7

Don't close the menu when you held control even for execute
---

diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index 77244d8..0e9e738 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -206,7 +206,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
     /* If there is a keyboard grab going on then we need to cancel
        it so the application can grab things */
-    event_cancel_all_key_grabs();
+    if (data->uact != OB_USER_ACTION_MENU_SELECTION)
+        event_cancel_all_key_grabs();
 
     e = NULL;
     if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) {
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index b235f5e..afffc83 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -1266,7 +1266,7 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)
 
         /* release grabs before executing the shit */
         if (!(state & ControlMask)) {
-            menu_frame_hide_all();
+            event_cancel_all_key_grabs();
             frame = NULL;
         }