From: Dana Jansens <danakj@orodu.net>
Date: Sun, 20 May 2007 02:15:07 +0000 (+0000)
Subject: fix segfault by ordering shutdown properly
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=3a280fa9495f1651148f627fb621bebbc438e647;p=chaz%2Fopenbox

fix segfault by ordering shutdown properly
---

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 7270379e..ec5c7db2 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);