summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-06-10 19:37:09 +0000
committerDana Jansens <danakj@orodu.net>2007-06-10 19:37:09 +0000
commitb8e78bba16eb0030689e710572d4b5d45432d089 (patch)
tree898baaf2e632de92fccd3c6c8284410faebad2f3
parenta1f882b264505885228d1d47d65f11a5f460a187 (diff)
cache pipe menus without crashing!
-rw-r--r--openbox/menu.c3
-rw-r--r--openbox/menuframe.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/openbox/menu.c b/openbox/menu.c
index 344e1a5a..c82eab80 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -424,6 +424,9 @@ void menu_show(gchar *name, gint x, gint y, gint button, ObClient *client)
menu_frame_hide_all();
+ /* clear the pipe menus when showing a new menu */
+ menu_clear_pipe_caches();
+
frame = menu_frame_new(self, 0, client);
if (!menu_frame_show_topmenu(frame, x, y, button))
menu_frame_free(frame);
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index fa9e8e9d..654cf2ba 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -1058,8 +1058,6 @@ void menu_frame_hide_all()
}
if ((it = g_list_last(menu_frame_visible)))
menu_frame_hide(it->data);
-
- menu_clear_pipe_caches();
}
void menu_frame_hide_all_client(ObClient *client)
@@ -1070,8 +1068,6 @@ void menu_frame_hide_all_client(ObClient *client)
if (f->client == client)
menu_frame_hide(f);
}
-
- menu_clear_pipe_caches();
}