Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-06 19:01:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed menus locking up, and menus not hiding

Browse source
This commit is contained in:
OM 2023-05-16 19:01:44 +02:00
parent 73cf84506b
commit 5200e886d7
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
code/uilib/uimenu.cpp
View file

@ -205,7 +205,7 @@ void Menu::HideMenu
if( !force ) if( !force )
{ {
Event *event = new Event( "hide" ); Event *event = new Event( "hide" );
PostEvent( event, maxtime ); wid->PostEvent( event, maxtime );
} }
} }
else else
@ -584,6 +584,9 @@ void Menu::CheckRestart
CLASS_DECLARATION( Listener, MenuManager, NULL ) CLASS_DECLARATION( Listener, MenuManager, NULL )
{ {
{ &EV_PushMenu, &MenuManager::PushMenu },
{ &EV_LockMenus, &MenuManager::Lock },
{ &EV_UnlockMenus, &MenuManager::Unlock },
{ NULL, NULL } { NULL, NULL }
}; };
@ -765,7 +768,7 @@ void MenuManager::PopMenu
{ {
Menu *top; Menu *top;
Menu *head; Menu *head;
float maxtime; float maxtime = 0.0;
if( m_lock ) if( m_lock )
{ {
@ -799,12 +802,12 @@ void MenuManager::PopMenu
{ {
head->PostEvent( Event( "showmenu" ), maxtime ); head->PostEvent( Event( "showmenu" ), maxtime );
} }
}
Lock(NULL); Lock(NULL);
PostEvent(EV_UnlockMenus, maxtime); PostEvent(EV_UnlockMenus, maxtime);
} }
} }
}
Menu *MenuManager::CurrentMenu Menu *MenuManager::CurrentMenu
( (