cache pipe menus without crashing!

diff --git a/openbox/menu.c b/openbox/menu.c
index 344e1a5a1ea49b2ac97cfadcbac13d2fed1ff133..c82eab8033f323899407e48b88575be0022a8bf1 100644 (file)
--- 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 fa9e8e9d9ab1ab59e1c93a9670f2615c663232e2..654cf2ba611932012f62394b10950a2ef8093758 100644 (file)
--- 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();
 }