Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed bug popping menus

Browse source
This commit is contained in:
jsalmon3 2003-02-14 02:38:14 +00:00
parent f0aacc16df
commit a98b776c7b
2 changed files with 12 additions and 10 deletions

20
src/ui/menu_proc.cpp
View file

@ -1991,18 +1991,18 @@ local void PopMenu(void)
Menuitem* mi;
int i;
for (i = 0; i < CurrentMenu->nitems; ++i) {
mi = CurrentMenu->items + i;
if (mi->exitfunc) {
(*mi->exitfunc)(mi); // action/destructor
if (Menus && Menus->Menu == CurrentMenu) {
for (i = 0; i < CurrentMenu->nitems; ++i) {
mi = CurrentMenu->items + i;
if (mi->exitfunc) {
(*mi->exitfunc)(mi); // action/destructor
}
}
}
MenuButtonUnderCursor = -1;
MenuButtonCurSel = -1;
CurrentMenu = NULL;
MenuButtonUnderCursor = -1;
MenuButtonCurSel = -1;
CurrentMenu = NULL;
if (Menus) {
MenuButtonCurSel = Menus->CurSel;
menu = Menus;
Menus = Menus->Next;
@ -2010,6 +2010,8 @@ local void PopMenu(void)
if (Menus) {
CurrentMenu = Menus->Menu;
}
} else {
CurrentMenu = NULL;
}
}

2
src/ui/menus.cpp
View file

@ -1621,7 +1621,7 @@ local void SoundOptionsExit(Menuitem *mi __attribute__((unused)))
*/
local void GlobalOptionsMenu(void)
{
ProcessMenu("menu-global-options", 0);
ProcessMenu("menu-global-options", 1);
}
/**