zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed VM abort when entering search menu

Browse source 
https://forum.zdoom.org/viewtopic.php?t=65833
This commit is contained in:
alexey.lysiuk 2019-09-08 09:52:16 +03:00
parent 06ad60718c
commit 526a576d89
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wadsrc/static/zscript/ui/menu/optionmenu.zs
View file

@ -107,7 +107,10 @@ class OptionMenu : Menu
mDesc = desc; mDesc = desc;
DontDim = desc.mDontDim; DontDim = desc.mDontDim;
let last = mDesc.mItems[mDesc.mItems.size() - 1]; let itemCount = mDesc.mItems.size();
if (itemCount > 0)
{
let last = mDesc.mItems[itemCount - 1];
bool lastIsText = (last is "OptionMenuItemStaticText"); bool lastIsText = (last is "OptionMenuItemStaticText");
if (lastIsText) if (lastIsText)
{ {
@ -118,6 +121,7 @@ class OptionMenu : Menu
mDesc.mItems.Pop(); mDesc.mItems.Pop();
} }
} }
}
if (mDesc != NULL && mDesc.mSelectedItem == -1) mDesc.mSelectedItem = FirstSelectable(); if (mDesc != NULL && mDesc.mSelectedItem == -1) mDesc.mSelectedItem = FirstSelectable();
mDesc.CalcIndent(); mDesc.CalcIndent();