X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=69a5fe5aa4010d6da5bdbdeb95830a6070c9c2f6;hb=d77c8f62f2f908cfe1d09686a35dce1ccaf65aec;hp=503876655570f93d13d9e3462c1cc8a9ed95d25b;hpb=5648f0d75c22c817c740a9345e50dfd2ac2f6ffc;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 50387665..69a5fe5a 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "screen.h"
 #include "menuframe.h"
+#include "keyboard.h"
 #include "geom.h"
 #include "misc.h"
 #include "client_menu.h"
@@ -68,7 +69,7 @@ void menu_startup(gboolean reconfig)
     menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
                                       (GDestroyNotify)menu_destroy_hash_value);
 
-    client_list_menu_startup();
+    client_list_menu_startup(reconfig);
     client_menu_startup();
 
     menu_parse_inst = parse_startup();
@@ -109,6 +110,8 @@ void menu_shutdown(gboolean reconfig)
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
 
+    client_list_menu_shutdown(reconfig);
+
     menu_frame_hide_all();
     g_hash_table_destroy(menu_hash);
     menu_hash = NULL;
@@ -286,7 +289,8 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
     ObMenuFrame *frame;
     guint i;
 
-    if (!(self = menu_from_name(name))) return;
+    if (!(self = menu_from_name(name))
+        || keyboard_interactively_grabbed()) return;
 
     /* if the requested menu is already the top visible menu, then don't
        bother */