X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=c52f30131b5b76d212ff6836061142d820ddf07b;hb=1df4e327607f7dcf56826928efdddb809d8f1fc3;hp=d954102762dc1d1309d8749208ccb4e70c7d79db;hpb=67f9061a7a8d28b1859bc19baad5811d5310ae47;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index d9541027..c52f3013 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -55,14 +55,14 @@ static gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node)
     return loaded;
 }
 
-static void client_dest(ObClient *c)
+static void client_dest(gpointer client)
 {
     /* menus can be associated with a client, so close any that are since
        we are disappearing now */
-    menu_frame_hide_all_client(c);
+    menu_frame_hide_all_client(client);
 }
 
-void menu_startup()
+void menu_startup(gboolean reconfig)
 {
     xmlDocPtr doc;
     xmlNodePtr node;
@@ -100,12 +100,14 @@ void menu_startup()
     
     g_assert(menu_parse_state.menus == NULL);
 
-    client_add_destructor(client_dest);
+    if (!reconfig)
+        client_add_destructor(client_dest);
 }
 
-void menu_shutdown()
+void menu_shutdown(gboolean reconfig)
 {
-    client_remove_destructor(client_dest);
+    if (!reconfig)
+        client_remove_destructor(client_dest);
 
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;