summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-20 02:15:07 +0000
committerDana Jansens <danakj@orodu.net>2007-05-20 02:15:07 +0000
commit3a280fa9495f1651148f627fb621bebbc438e647 (patch)
tree278fa447eab192c467ee118659f10b6369e342db
parentd3f67abe46acf363c04ec7491eea649c1be65428 (diff)
fix segfault by ordering shutdown properly
-rw-r--r--openbox/openbox.c4
1 files changed, 2 insertions, 2 deletions
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);