Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Newmenus: get_user_menu should also handle newmenu timeouts properly

Browse Source
This commit is contained in:
Valentin Grünbacher 2014-05-21 19:01:27 +02:00
parent fa5336cade
commit c8b7a09028
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
amxmodx/amxmodx.cpp
View File

@ -2962,7 +2962,14 @@ static cell AMX_NATIVE_CALL get_user_menu(AMX *amx, cell *params) /* 3 param */
{ {
if (gpGlobals->time > pPlayer->menuexpire) if (gpGlobals->time > pPlayer->menuexpire)
{ {
pPlayer->menu = 0; int menu = pPlayer->newmenu;
if (menu >= 0 && menu < (int)g_NewMenus.size() && g_NewMenus[menu])
{
Menu *pMenu = g_NewMenus[menu];
pMenu->Close(pPlayer->index);
}
else
pPlayer->menu = 0;
*cpMenu = 0; *cpMenu = 0;
*cpKeys = 0; *cpKeys = 0;