Fix a typo causing submenuShowDelay to be ignored (Bug 6019)

This commit is contained in:
Tom Sires 2013-08-27 08:02:31 -05:00 committed by Dana Jansens
parent 0a7ff45e49
commit 0afb5b28c6

View file

@ -1242,9 +1242,9 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
/* only show if the submenu isn't already showing */ /* only show if the submenu isn't already showing */
if (oldchild_entry != self->selected) { if (oldchild_entry != self->selected) {
if (immediate || config_submenu_hide_delay == 0) if (immediate || config_submenu_show_delay == 0)
menu_entry_frame_show_submenu(self->selected); menu_entry_frame_show_submenu(self->selected);
else if (config_submenu_hide_delay > 0) { else if (config_submenu_show_delay > 0) {
if (submenu_show_timer) if (submenu_show_timer)
g_source_remove(submenu_show_timer); g_source_remove(submenu_show_timer);
submenu_show_timer = submenu_show_timer =