hide the menus before shutting them down on reconfigure

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index daea0b65e12d025f3261ae45de0c96edb9752b0f..c97fb56bd5fec2049479999708f016ae13b86bdf 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -115,10 +115,11 @@ void menu_shutdown(gboolean reconfig)
     obt_xml_instance_unref(menu_parse_inst);
     menu_parse_inst = NULL;
 
-    client_list_menu_shutdown(reconfig);
+    menu_frame_hide_all();
+
     client_list_combined_menu_shutdown(reconfig);
+    client_list_menu_shutdown(reconfig);
 
-    menu_frame_hide_all();
     g_hash_table_destroy(menu_hash);
     menu_hash = NULL;
 }
@@ -287,7 +288,7 @@ static void parse_menu_item(xmlNodePtr node,  gpointer data)
                 ObActionsAct *action = actions_parse(c);
                 if (action)
                     acts = g_slist_append(acts, action);
-                c = obt_xml_find_node(node->next, "action");
+                c = obt_xml_find_node(c->next, "action");
             }
             e = menu_add_normal(state->parent, -1, label, acts, TRUE);