mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 05:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not open sub-menus when timer elapsed and we are already opening or closing a menu (base->is_processing).

Browse Source
This commit is contained in:
David Capello 2011-01-16 17:25:06 -03:00
parent 701cac25ca
commit 28ba73c168
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/jmenu.cpp
View File

@ -1037,14 +1037,16 @@ static bool menuitem_msg_proc(Widget* widget, JMessage msg)
case JM_TIMER: case JM_TIMER:
if (msg->timer.timer_id == menuitem->submenu_timer) { if (msg->timer.timer_id == menuitem->submenu_timer) {
Base* base = get_base(widget);
ASSERT(HAS_SUBMENU(widget)); ASSERT(HAS_SUBMENU(widget));
// Stop timer to open the popup // Stop timer to open the popup
jmanager_remove_timer(menuitem->submenu_timer); jmanager_remove_timer(menuitem->submenu_timer);
menuitem->submenu_timer = -1; menuitem->submenu_timer = -1;
// If the submenu is closed, open it // If the submenu is closed, and we are not processing messages, open it
if (menuitem->submenu_menubox == NULL) if (menuitem->submenu_menubox == NULL && !base->is_processing)
open_menuitem(widget, false); open_menuitem(widget, false);
} }
break; break;