all repos — openbox @ 040b451ed0e2487031b15ca518ad4fdf9fefd559

openbox fork - make it a bit more like ryudo 

fix a crash with the focused client closing during the delay of a submenu being shown (and add an assert for this too)
Dana Jansens danakj@orodu.net
commit

040b451ed0e2487031b15ca518ad4fdf9fefd559

parent

84cdb2be99b4e399f913b8557e8a84a0386a3ae1

1 files changed, 8 insertions(+), 1 deletions(-)

jump to
M openbox/menuframe.c → openbox/menuframe.c 
@@ -1075,8 +1075,14 @@ {
     GList *it = g_list_last(menu_frame_visible);
     if (it) {
         ObMenuFrame *f = it->data;
-        if (f->client == client)
+        if (f->client == client) {
+            if (config_submenu_show_delay) {
+                /* remove any submenu open requests */
+                ob_main_loop_timeout_remove(ob_main_loop,
+                                            menu_entry_frame_submenu_timeout);
+            }
             menu_frame_hide(f);
+        }
     }
 }
 

@@ -1121,6 +1127,7 @@ }
 
 static gboolean menu_entry_frame_submenu_timeout(gpointer data)
 {
+    g_assert(menu_frame_visible);
     menu_entry_frame_show_submenu((ObMenuEntryFrame*)data);
     return FALSE;
 }