X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=f66f6a762e4d748f2add4314619775dbd368cbec;hb=7be9d84615b1eedb758b45f4525d96975fcd190e;hp=7270379e47923e2be1ec5bcc271fcd43dcf36e36;hpb=ed4d0ca31a9c1c6c815cb87a058bb1d36a0888c1;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 7270379e..f66f6a76 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -301,8 +301,8 @@ gint main(gint argc, gchar **argv)
             moveresize_startup(reconfigure);
             keyboard_startup(reconfigure);
             mouse_startup(reconfigure);
-            menu_startup(reconfigure);
             menu_frame_startup(reconfigure);
+            menu_startup(reconfigure);
 
             if (!reconfigure) {
                 guint32 xid;
@@ -344,8 +344,8 @@ gint main(gint argc, gchar **argv)
                 client_unmanage_all();
             }
 
-            menu_frame_shutdown(reconfigure);
             menu_shutdown(reconfigure);
+            menu_frame_shutdown(reconfigure);
             mouse_shutdown(reconfigure);
             keyboard_shutdown(reconfigure);
             moveresize_shutdown(reconfigure);
@@ -477,6 +477,7 @@ static void print_help()
     g_print(_("  --sm-disable        Disable connection to the session manager\n"));
     g_print(_("\nPassing messages to a running Openbox instance:\n"));
     g_print(_("  --reconfigure       Reload Openbox's configuration\n"));
+    g_print(_("  --restart           Restart Openbox\n"));
     g_print(_("\nDebugging options:\n"));
     g_print(_("  --sync              Run in synchronous mode\n"));
     g_print(_("  --debug             Display debugging output\n"));
@@ -542,10 +543,8 @@ static void parse_args(gint *argc, gchar **argv)
         }
         else if (!strcmp(argv[i], "--reconfigure")) {
             remote_control = 1;
-/* don't make this do anything if it's not in --help ..
         } else if (!strcmp(argv[i], "--restart")) {
             remote_control = 2;
-*/
         }
         else if (!strcmp(argv[i], "--sm-save-file")) {
             if (i == *argc - 1) /* no args left */