From: Dana Jansens Date: Sun, 10 Jun 2007 19:37:09 +0000 (+0000) Subject: cache pipe menus without crashing! X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=b8e78bba16eb0030689e710572d4b5d45432d089;p=chaz%2Fopenbox cache pipe menus without crashing! --- 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(); }